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

Change-Id: I130ba1362d755e1859d5c22311867008d0626890