Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I5d299e2907e204ffccbe898eef0c508b1e518bb0