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

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

Change-Id: I26ee8724b29a9a6b33fbc750d99d30d2218011d6