[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600 -s ours

am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20136682



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