Merge "Replace AppOpsManager @hide APIs" am: a80bc72775

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

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2