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

* commit 'df8cb6d106eb9440b3b5f1d610cf946560454ea8':
  Camera: fix time measuring logic