Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev