[automerger skipped] Reduce blocking calls to Settings in main thread am: 4da071e035 -s ours am: 566421dc5c -s ours am: a6a12e7354 -s ours

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

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

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