Merge changes from topic "am-5b3500c6a7f543f9abf695f3343f61c0" into sc-dev

* changes:
  [automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: 02ed58ad24 -s ours
  [automerger skipped] Replace the usage of UidRange am: f8c3e2eb4e -s ours