Merge "Correct default to match CarrierConfigManager"
am: 91027b2989

Change-Id: Id14857a2ae6c473d0977e7f4e35578ef67d68eb5