Merge "Reduce lock contention on setting write." into tm-dev am: e06f5b1a

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



Change-Id: Ie3f9f784d8f3090f20511712f8c873e87b901d15
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>