[automerger skipped] Merge "Add null check for AppOpsService" into main am: 35bb4587b0 am: 2eba3a2463 -s ours

am skip reason: Merged-In I94e91b87f21290d2ea88d449c1461aaa6e2e6e10 with SHA-1 d894bed24e is already in history

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

Change-Id: I1f4ba9ca0808854810a02f81ee5767b683ac7e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>