Merge "Add new method for getCdmaSubscriptionMode" am: a22a94dd5f am: 140365c164

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

Change-Id: I3ef48407dcd92361f5be45b40d66eb6807fdb2cf