Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803b am: 6f8db1af -s ours
  [automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 98201374 am: f3cc967b -s ours
  [automerger skipped] Clarify comments for Connectivity Diagnostics reports. am: 95a98c2e am: 412cbc87 -s ours
  [automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656 am: 2bf058b2 -s ours
  [automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab am: ea9699a5 -s ours
  [automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: 4600fa52 am: af15704e -s ours
  [automerger skipped] Decrement networkRequestPerUid when callbacks are unregistered. am: 13564eed am: c3f92fbd -s ours
  [automerger skipped] Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: 560eb265 am: 9b95f410 -s ours