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

Change-Id: Id246b35f04ceee44f386773660dbcb0e2a800208