Merge "Add the rules to disable emergency dialer shortcut feature." am: 8d04539b27
am: dda3a75859

Change-Id: Ifd4ae5ad141c858a00d24825c80648f663973fbf