Merge "Disable emergency dialer shortcuts feature"
am: 71ae7eee15

Change-Id: I3896cf3baadd1a3622858c9e6cedb1ade47ab081