Merge "Preserve permissions when system apps leaving shared UID are uninstalled"