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

Change-Id: I4e61f4ede55eaa670f53074055e10f6f82e35755