Merge "Camera: fix time measuring logic" into lollipop-cts-dev