[automerger skipped] Merge "Fix issue where EmergencyDialer is slow to open in some cases." am: b5cd1dad2e
am: f8ea51cd71  -s ours

Change-Id: I4d83c62b14f124708f23dd194864ae6d7343cdb6