Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev