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 am: e1585cd7

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



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