Chiachang Wang 7b582e9749 Merge changes from topic "replaceUidRange" ...

* changes:
  Expose uids related APIs in NetworkRequest and NetworkCapabilities
  Replace the usage of UidRange

2021-03-18 13:36:39 +00:00

..

android

Merge "Add a VpnManager.TYPE_VPN_OEM."

2021-03-18 13:12:08 +00:00

com/android

Merge changes from topic "replaceUidRange"

2021-03-18 13:36:39 +00:00