Merge "Clean up permissions when uids are no longer used" am: aa949eeae0
am: 26f1e2dbb1

Change-Id: I256ca6f16ea1fcd240a1b7cd2b3199d4504e6c33