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

Change-Id: I9dc0b8711534c1dcdc5715a888a87fb4730f5061