Merge "Add new method for getCdmaSubscriptionMode" am: a22a94dd5f

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

Change-Id: I323ef9a9f8e7d14d202bf72b30c68efcb18fcddb