Merge "[MEP] Add port index in SubscriptionInfo database" am: ec3cea8b4a am: a08589ae1d

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2046550

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