[automerger skipped] Merge changes from topic "settings-change" into...

[automerger skipped] Merge changes from topic "settings-change" into udc-qpr-dev am: 05b23ee4 am: 5a2b04a7 -s ours

am skip reason: Merged-In Ibbd1a74f3e87ee8a5f003db90fcfbee9ca89d359 with SHA-1 095e2e11 is already in history

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



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