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: 0ca9d4e3 am: 7cf271ec

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



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