Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"

* changes:
  Revert "Replace the usage of UidRange"
  Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."