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

Merge "Merge "Fix NPE in AppOpsService." into rvc-dev am: b19aa988 am: 34b644ec am: 85c755be" into rvc-qpr-dev-plus-aosp am: 19c8a8ec

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

Change-Id: I5b8de53a11aa6f0fa8f7190aaf2e4770631635a6