am bcf5c6fe: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793':
  When retrying disassociate an ApnContext from a DC only when failed or idle.
  Revert "Act on no-prefered-apn-on-connect config option."
  Act on no-prefered-apn-on-connect config option.
tree: e7af24504baacf3ddd8da6b4c54fec110bca065c
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk