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

Change-Id: I6572c409ee7e1aff117deaeeac629aa1c2fb4a3e