Merge "setCdmaSubscription/RoamingMode returns when not CDMA" into sc-dev