Merge "Replace AppOpsManager locking with std::lock_guard"
am: d3a9228d1d

* commit 'd3a9228d1d2388f21b4e8013cf2fad7b4c91ace7':
  Replace AppOpsManager locking with std::lock_guard