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

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

Change-Id: If8c420e6daf779940c9e700796e1594eb4bc96ec