Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 am: 5e56187d53

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

Change-Id: I9548c666d528e025b71f5d3b12b0c5ff2265eb23