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

Change-Id: I3c06a36368abb9a1e7885d281ea1155fce857eea
tree: 8eabd3370be5ae76c4fcc674fee74b1a1794a2fa
  1. core/
  2. services/
  3. tests/