Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev