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 am: d556511f" into rvc-qpr-dev-plus-aosp am: 12daf7d6

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

Change-Id: I093a61f2f1b7c24f42a4a7a38b4d9058aa60a19b