[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for...

[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: a2065382 am: bfb42aca -s ours am: f3a45913 -s ours

am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 3de24326 is in history

Change-Id: I12553e812e0b6e6ffe9a467f68f72f97ad66f876