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

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

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



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