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

Change-Id: Ib375779ad727c9ba8906d9e5909110a0ac7ac8d4