Merge "Fix potential race condition due to missing lock" am: 8787386e84 am: af33aac24e

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

Change-Id: I81530ff1530b8ef5a2a11c47c7a5ab963a865397