Merge "Merge "Reduce lock contention on setting write." into tm-dev am: e06f5b1a am: 0ca9d4e3" into tm-d1-dev-plus-aosp am: 765e073d

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



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