Merge "Enable emergency dialer shortcuts feature" am: 38300d0d6f
am: dc3ccd72ce

Change-Id: I69dc770995fb1e675cd6f40f25351be4f2e7cc6e