Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 am: 5e56187d53 am: 22c7f24f4b am: 1d7f371302

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

Change-Id: I3edb79a9e05efb0c898a393a7ab98cd9d3305466