[automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb -s ours am: e72aefc1 -s ours

am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5 is already in history

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



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