Merge "Merge "Added default home values of CDMA roaming indicator" am: a7c51a3d" into stage-aosp-master