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

Change-Id: I135af6890da5810882dc3806cff47bcd960d12af