[automerger skipped] Merge "Add getSubscriptionId API" am: 67fe8174 am:...

[automerger skipped] Merge "Add getSubscriptionId API" am: 67fe8174 am: 64395b3c am: d98fad60 -s ours am: 6e2333d4 -s ours

am skip reason: Merged-In I6f400f3a520bdeaf72bcb232c0472cd2f6f255a8 with SHA-1 959c1281 is already in history

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



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