Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf
  Updating MTS Canada APN config (302-660)
  Fix APN configs for SoftBank JP (MCCMNC=44020) per their request. This issue was reported on Shamu with mnc-release, but we couldn't fix it before M OTA because of schedule issue.
  Change to add user_visible field to Carriers table.

Change-Id: Ic58a046cb68dd9bcb380c63b215072416c4ba7ea