Merge "Updateability: Resolve dependency to hidden api in AppOpsManager, use a...
Merge "Updateability: Resolve dependency to hidden api in AppOpsManager, use a public Api instead" am: bd174e7b am: a8e76bb5
am: e3a0c853
Change-Id: I7265d3cfbe61cd7cf2255832b4e8a57265457fc5