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

* commit 'c533d820eb4f219c340329d26c49b87392023ebc':
  Refactoring the ThemeHostTest to reduce timeout.