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
tree: a522c1f94403a04f5901340875078a03dce0e82e
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags