[automerger skipped] Merge changes If41d957f,I5c49d195 into 24D1-dev am: 381638f284 -s ours

am skip reason: Merged-In If41d957f916a99eacc1becb6b460e58722a4dca7 with SHA-1 6e4ac4bdc0 is already in history

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

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