Merge "Merge "Null safe package name in AppOps writeState" into sc-dev am:...

Merge "Merge "Null safe package name in AppOps writeState" into sc-dev am: 0abd07b3 am: 0f5068fa" into sc-v2-dev-plus-aosp am: 4a2d0a9b

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

Change-Id: I937df55c3feb73711b0f4a51d38498e3b7097656