[automerger skipped] Merge "[MEP] Add port index in SubscriptionInfo database" am: ec3cea8b4a am: a08589ae1d am: 776e0b4108 -s ours

am skip reason: Merged-In I9b6e8753b48edad1d93ebe62fd130a9da2c9d057 with SHA-1 4783abb4ca is already in history

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

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