Merge "[CameraITS] Camera ITS Test fails on camera 1 scene 1" into oreo-cts-dev
am: b8ee64f69a

Change-Id: I988b2258737fae54ec93dac2d478e4ab0255ccb2