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

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

Change-Id: Ie2fe000d93f3edd0e3c8ac0d049850d7c9510c01