Merge "Merge "Skip testThemes in Automotive" into pie-cts-dev am: f53846e445" am: c81cb17a77
am: a2e7ac90b7

Change-Id: I6dfea019ec14de342e0c7364af17cbc37eae7701