Merge "Fix race in AppOpsManager client library"
am: 712fe62ab2

* commit '712fe62ab282b3897fc1ee98e35b12d95663be52':
  Fix race in AppOpsManager client library