Merge "Clean up permissions when uids are no longer used"
am: 7754d368f4

Change-Id: I3c06a36368abb9a1e7885d281ea1155fce857eea