Merge "Expose UIDs for NetworkStack permission checks"
am: 3b887bdf4a

Change-Id: I893fbd359e9d5e7731e3b640b86ec9dd05b829f3