Merge "Fix thread-shared field evades lock acquisition reported by Coverity" am: 66fc99d578 am: 7427d997f6

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

Change-Id: I6b290dc2cbb93837e74ea5040b359e72d22beab0