am 63530ed8: am b13eb3e7: Merge changes I674b9804,If2d2e37b into jb-mr2-dev

* commit '63530ed8dad1ca77d5f9d20f2af7317611cdd175':
  Add touch navigation input source
  Add InputDevice#isFromSource convenience method