Merge "Merge "Merge "camera2: Take sync latency into account in testPreviewFpsRange" into marshmallow-cts-dev am: 2e8113576a" into nougat-cts-dev am: 880ecc0f36" into nougat-mr1-cts-dev
am: 7d350cc180

Change-Id: I201e0dcea0feafe83624c59817b817f084234000