Merge "Expose get/setCdmaRoamingMode and get/setCdmaSubscriptionMode as system API" am: 0099578124 am: e8966fb50a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506400

Change-Id: Iad03515c4da782161b1b7cd27b3ef391a3e65e75