am 9c73c0a2: am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev

* commit '9c73c0a2f2c39cc5e2e1f5d92eaf1fc4b61beb1d':
  Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE