[automerger skipped] Merge "Add new method for getCdmaSubscriptionMode" am:...

[automerger skipped] Merge "Add new method for getCdmaSubscriptionMode" am: 7e58cb94 am: a29f3a4d am: a4eb3d6f am: ca922b65 -s ours

am skip reason: Change-Id Ib67bc8cee23638614c322bc2772f17720985e188 with SHA-1 b24a49a8 is in history

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

Change-Id: Ie1f522bad0aff19912cb39da8ad882cf0f74cb56