Merge "Add plumbing for the 911 redial" am: 0c3e81b743 am: 40eff19973
am: 6df41dc194

Change-Id: Id4ad05a1faa80b0e7a2eeb91aecbe887fe5a147d