Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev