am 404c4855: am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev

* commit '404c4855ab0f85bd5ccccf0d3e443819bad6762a':
  Clarify InputDevice#getControllerNumber documentation