[automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 628cb1187e -s ours

am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 0c32e09028 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646848

Change-Id: I1773af223afb67d522cc05d3658608505340023e