Merge "Merge "Merge "[automerger skipped] Merge "CameraITS: scene0/test_gyro_bias failed when running ITS" into oreo-cts-dev am: 9f9ab333f4  -s ours" into oreo-mr1-cts-dev am: caf7370a97  -s ours" into pie-cts-dev am: 7499d1ee3d  -s ours"
am: 5e40af6419  -s ours

Change-Id: Ie819152691c58799ab3bf9d8a7d96e163eb5dae2