Merge "Add explicit SYSTEM_UID check to ActivityStarter#isUidPersistentSystemProcess()"