am 6c2e9e1d: am dfe8262b: Merge "Fix possible ANR in com.android.phone" into lmp-dev
am 6c2e9e1d: am dfe8262b: Merge "Fix possible ANR in com.android.phone" into lmp-dev

* commit '6c2e9e1d31bbf2bbac063096455b4e134208b5c8':
  Fix possible ANR in com.android.phone

md5555/android_packages_services_Telephony