Merge "Fix NPE in AppOpsService." into rvc-dev am: b19aa9888f am: c812726bc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11938963

Change-Id: Ibe4e02f0c9f7bca2415edac7fc3e0a8f331b8cbc

services/core/java/com/android/server/appop/AppOpsService.java

@@ -3744,7 +3744,7 @@ public class AppOpsService extends IAppOpsService.Stub {
                     mHandler.sendMessage(PooledLambda.obtainMessage(
                             AppOpsService::notifyOpChangedForAllPkgsInUid,
                             this, code, uidState.uid, true, null));
-                } else {
+                } else if (uidState.pkgOps != null) {
                     final ArraySet<ModeCallback> callbacks = mOpModeWatchers.get(code);
                     if (callbacks != null) {
                         for (int cbi = callbacks.size() - 1; cbi >= 0; cbi--) {