am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call
am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
  Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base