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