[automerger skipped] Fixed inactive pSIM not shown in settings am: 0c328a1e...

[automerger skipped] Fixed inactive pSIM not shown in settings am: 0c328a1e am: 48f34c74 -s ours am: bc5f1d28 -s ours

am skip reason: Merged-In I36126c16cbe21b7288ee7974b3ccf826c9393f0f with SHA-1 cbd03b17 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681805



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