[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: 4cab4ab5f2 am: bfb42aca28 -s ours
am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 2abe611e5b is in history
Change-Id: Ib35a6b7a91bc578d73c6bc2c2dde4a6c6ae04578
This commit is contained in: