am 79177922: am f6844951: am 8d12849e: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev automerge: 68b8b47

* commit '7917792290627381d33481daeb58081c1da81d72':
  Refactoring the ThemeHostTest to reduce timeout.