Merge "Fix NPE in AppOpsService when calling getPackagesForUid()." into main