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

Change-Id: I4637aa9a734c5d88c0daf379809a170e577c6979