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

Merge "Merge "Null Check in AppOpsInfo." into rvc-dev am: 24790e96 am: 8e428540" into rvc-d1-dev-plus-aosp am: 4205a1e8 am: bc9ea2e9

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

Change-Id: Iaca3d23219cf359eb97b25abf92d7c67773a6ab9