Merge "[automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c61077 -s ours am: 964605dc -s ours am: 881130bd -s ours" into sc-dev am: 3e0ec047 -s ours am: e43c2846 -s ours

am skip reason: Merged-In I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 8f2f98f8 is already in history

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

Change-Id: I07560e8516a04fb30d876e6793c96591b9d3d167