[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical...

[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1 am: bfe417ee am: 56f8390f -s ours am: 3b41ab21 -s ours am: 044697cd -s ours am: 6933e984 -s ours

am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc is already in history

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



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