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

Change-Id: I622f74b03dd3e201f3000b926571352a55ae10e9