Merge "Remove hidden APIs from EmergencyDialer."
am: 67348d3af6

Change-Id: I19fa53ab99633416faa0d887eda53071a3794bcf