[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am:...

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb03 -s ours am: 8fddc2a7 -s ours

am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc is already in history

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



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