Merge "Updateability: Resolve dependency to hidden api in AppOpsManager, use a public Api instead"