Merge "Add support for auto redialing 911"
am: e5450a62a1

Change-Id: I4ba438cf0731a81b90594eb1226999d1554c1b02