Merge \"Trapping backspace at EditText level to prevent popping Docs.\" into nyc-mr1-dev
am: 2df618f4cd

Change-Id: I2f8a3c1d0c0c6a017e212288458429627f7c7544