am 1309ebea: am 06917fd9: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies"

* commit '1309ebea21e2fa8ee5712e3e583fdbbf54844348':
  fix ArrowKeyMovementMethodTest KeyEvent inconsistencies