Merge change 20157

* changes:
  Fix the issue of datacall not being reinitiated after exiting Emergency Callback Mode.

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

@@ -945,6 +945,8 @@ public class CDMAPhone extends PhoneBase {
             }
             // send an Intent
             sendEmergencyCallbackModeChange();
+            // Re-initiate data connection
+            mDataConnection.setDataEnabled(true);
         }
     }