Merge "Replace AppOpsManager @hide APIs"