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

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



Change-Id: If32d84547f2a40a48eb70889368d5bca6a79388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>