Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  IMS: Enable check for GBA support on T-Mobile's SIMs
  Adding config to allow/disallow user to add APNs.

Change-Id: Ifc4df4310414dcd1cc7e42dc2a4baaa252c17ec7