Merge "cameraservice: Remove unused imports" into main