Merge "CameraServiceProxy: Double retry times when notifying cameraserver"