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

Change-Id: I550b0243975dcab19386db611d6965b4bcbabb5c