Merge "Add extra data when starting emergency dialer intent" am: 0b925f85c0
am: e6ce88ca3c

Change-Id: Id27700b585ddafbf20ebdbd14cd92b3f3cf75cd3