Merge "Reduce lock contention on setting write." into tm-dev am: e06f5b1a am: 0ca9d4e3 am: 7cf271ec am: 2d74eb6a

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



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