Merge "CameraService: Fix dump methods for two clients" into lmp-dev