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