Merge change 20568

* changes:
  Revert "Disable data call in emergency call"