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

Change-Id: Icb5e3e8f1fca8f877d4b84296c956c61e2c12269