[automerger skipped] Merge "Add extra data when starting emergency dialer intent" am: 0b925f85c0 am: e6ce88ca3c
am: 2f5d2a50a8  -s ours

Change-Id: I6b148842022967b63cec431dc6c60407ee7bceb8