Merge "Fix potential race condition problem" am: 91a15e8a am: 1e5e9923 am: b61ce03d

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



Change-Id: I312a9ecebe183204ed433a2881adff6edefc7ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>