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

Change-Id: I603ffb569f393cc10b088afecdde95740ef35a43