am 68b8b477: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev

* commit '68b8b477a1e4c82fa54f471938ab0b3db3bbd8bd':
  Refactoring the ThemeHostTest to reduce timeout.