[automerger skipped] Merge "Fix potential race condition due to missing lock"...

[automerger skipped] Merge "Fix potential race condition due to missing lock" am: 8787386e am: af33aac2 am: a8c0e350 am: 77af314c am: 8d62aef4 -s ours

am skip reason: Merged-In I1dc7c03d031248fb945dc2cf9dd47ad590ec672c with SHA-1 402cd201 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864979

Change-Id: Ide03e82271ea90452abae285a52de57f7c545b8b