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

Change-Id: I4496b110d3fede92f8419e8150b6bf1c2b18fb9d