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

Change-Id: Id1430eb5ba26483bcc055c32f85f8fa495c2970c