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

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