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

Change-Id: I56c0c7b19e8b7bf17fa5187e1cb8acf6cf9ff6be