Merge "[automerger skipped] Merge "CameraITS: sensor_fusion/test_sensor_fusion failed when running ITS" into oreo-cts-dev am: 929dd56169  -s ours" into oreo-mr1-cts-dev am: 58f80939ab  -s ours
am: c3cab07f95  -s ours

Change-Id: I6b4d976c3cf98b5c461bbdf66462698b8002c5ea