Merge "Merge "Null Check in AppOpsInfo." into rvc-dev am: 24790e96 am:...

Merge "Merge "Null Check in AppOpsInfo." into rvc-dev am: 24790e96 am: 4756c9f0" into rvc-d1-dev-plus-aosp am: 1c3928b1 am: 579c3490

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

Change-Id: If49ef2e5383730444d6c58671101b564054066d7