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

Change-Id: I91a7c469447ac1ba4c9af8d71f5e7f63301b8e87