am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev

* commit '6b9345ece254eeff0a0ef542728e8964317fcbb7':
  camera2: Add passive unfocused state to AF state machine