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: d1027252 am: af60b02b
am: dcd9f137
Change-Id: I7265d3cfbe61cd7cf2255832b4e8a57265457fc5