Merge "Replace AppOpsManager locking with std::lock_guard"