[automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
am: f5557102c9
-s ours am: 620f9c0b28
-s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129
Change-Id: If5b7a1461b5a8fef8526f91689f3938ff6d4e4ef
This commit is contained in: