Merge "Set CDMA roaming/subscription mode throws ISE if not CDMA" into sc-dev