[automerger skipped] Merge "Expose get/setCdmaRoamingMode and get/setCdmaSubscriptionMode as system API" am: 0099578124 am: e8966fb50a am: b99c3e87a6 am: cdd8d10a04 -s ours
am skip reason: Change-Id I5fe64d4bfb463af40b6e0ccfad1515266e40f7f6 with SHA-1 85058d5bf2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506400
Change-Id: I6a7a0c3f6fc09e20bd9b32e53f94202b586e98bf
This commit is contained in: