am 6934e994: am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev

* commit '6934e994a0b7e6c950df151690f0840075fec432':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.