am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1

* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
  Remain in call audio mode while phone is offhook.