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

Change-Id: Ia4bc16db6cf07a1bc4eb50077d99d9c133658289