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

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

Change-Id: If33de767f397797a104bf2030ac4ca5f8928359f