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

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

Change-Id: I03bd873e8396994a03ca79cbcc272b4f58d1c7ea