Merge "setCdmaSubscription/RoamingMode returns when not CDMA"