[automerger skipped] Reuse the active esim slot am: 887bb592 am: da2d1d85...

[automerger skipped] Reuse the active esim slot am: 887bb592 am: da2d1d85 -s ours am: e74c1c42 -s ours am: 8710ee10 -s ours

am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa2473 is already in history

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



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