Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT."
am: 54ad67f884

Change-Id: I493c4ed4d45a71864be1caf7bb18751a127ef8b0