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

Change-Id: I15dafc543eae5ac4a40eff9884f1fd096921f53d