Merge "camera2: Take sync latency into account in testPreviewFpsRange" into marshmallow-cts-dev am: 2e8113576a
am: fa5ca72325

Change-Id: I4818c3b0dfaaef79aca0cf0c9cf3254a0867d8c1