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

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

Change-Id: Ifa2be5367a1afcb9803fe129951cf6c66ce30cc0