Merge "Handle com.android.phone.EmergencyDialer.DIAL intent action"
am: b6f3d9fa47

Change-Id: I6ed81c338b73514d4e2199b2ee21df3cee414bfe