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

Change-Id: I4c893a4be374ad617cf59a253f221850c8ded0e1