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

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