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
Change-Id: Icc0671311e07838972ddde06042bbed0fb6f5599