Merge "Fix issue where EmergencyDialer is slow to open in some cases."
am: b5cd1dad2e

Change-Id: I8620ad23d80be7351bffbca3605ad00bfd512a2e