Merge "Fix issue where EmergencyDialer is slow to open in some cases." into pi-dev
am: 3fe878a9d5

Change-Id: Idf6501ba08d9e996e9fdd5d5b2ca586f191927e7