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

Change-Id: I8193b7eecbe55d5b8c8f12baa503db1fab4509f4