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

Change-Id: I4156471eec78511fd86a1c381d53df57b1f4ea98