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

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

Change-Id: Ifd8d48a727d6ef1a1513e31aa8d2f2e35a06cb12