Merge "Set the value of KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: f025fbde93 am: 96ed54cd68
am: 84c6e521f7

Change-Id: Ifb64d6107f408958a1cbbfeb30020dd2958c7797