[automerger skipped] Reduce blocking calls to Settings in main thread am: 4da071e0 -s ours

am skip reason: Merged-In Idebd37d1458c80330b60802729575219b6a7b49a with SHA-1 4cbae072 is already in history

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



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