Merge "Disable on-screen keyboard for emergency dialer am: bdc9c884bb am: 9c6c5788ce" into nyc-mr1-dev-plus-aosp
am: fb7c0c536e

* commit 'fb7c0c536e35f55d4563bc0356b9654333890370':

Change-Id: Ie1750fafeeae22f640a906ebc544ea027c35c0af