am 72dbb5bf: merge in release branch changes (no-op).

* commit '72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639':
  camera2: Add updateCaptureRequest method
  camera2: Add #resetState to AutoFocusStateMachine