[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for...
[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: a2065382 -s ours
am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 3de24326 is in history
Change-Id: I696493642b1431ca41e7e70210955055015c563a