am b567892a: am f94cafa6: am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev

* commit 'b567892a5d2c5df08b21facc8a5bb8af72fe4914':
  fix ArrowKeyMovementMethodTest KeyEvent inconsistencies