[automerger skipped] Merge "Add new method for getCdmaSubscriptionMode" am: a22a94dd5f am: 140365c164 am: d109cb908e am: ef280978d9 -s ours

am skip reason: Change-Id I3527a93ba7390139e233e8fea2dc9cd7d8df9e5f with SHA-1 baab1438f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1506660

Change-Id: I4d3afdd3c50fbaff0d57e34ed7279c9ccc5946e0