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

Change-Id: Ia9bc41cebf048d536efa8aeea992fed3f583ba1b