Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT." am: 54ad67f884 am: 793a3dac05
am: 212ac77c9c

Change-Id: I28db9863c925ad85fcf26fa07d24a042e0091e2f