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