[automerger skipped] Merge "Handle com.android.phone.EmergencyDialer.DIAL intent action" am: b6f3d9fa47 am: ad1b796861 am: 81ff4ebdf4 -s ours
am skip reason: Change-Id I9d9e11b51fc744e4f3ce3e9943e3781deb732f0a with SHA-1 7fce6e146d is in history

Change-Id: I1fcfd83e27784d4fabb46160796a8aa49f9517f0