Merge "Merge "Skip testThemes in Automotive" into oreo-mr1-cts-dev am: 520a711750" into pie-cts-dev
am: db3deda7cc

Change-Id: I94a3e970be44eb3e4aff595aea60986ce4501cb7