[automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca5 -s ours am: 98c2ff5b -s ours

am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4c is already in history

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



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