Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I3385fe2660bf9da3f13ef90f4b4b17a8ad0b64ad