Merge "Camera 2: Add three metrics to cts performance test." into lmp-dev