am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev

* commit '6c5cc576e747a38cf6feef39a578d9cccb0ba251':
  camera2: Add state machine for doing auto-focus easily from apps