Merge "Workaround undocumented AppOps behavior" into sc-v2-dev am: ef968723a5 am: b20d32bfae

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

Change-Id: I9c61c7a04ef943e7415ddc25f897cbaf47c9d975