Merge "Fix race in AppOpsManager client library"