[automerger skipped] Merge "Remove logic to manually search inactive pSIM."...

[automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41 am: f5557102 -s ours am: 620f9c0b -s ours am: 8c81b0f4 -s ours

am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e5643 is in history

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

Change-Id: I0efa0bf0f9ecdbb870f3903145efeba3ce410c0a