Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev