[automerger skipped] Merge "Relax ThemeHost comparison" into nougat-cts-dev am: 0ad1833d99  -s ours skipped: c98a45d03a skipped: 541aa6abf2 skipped: 788faf2e95 skipped: 20b6ec9583 skipped: 52d9389f22

Change-Id: Iaa36b1006567cc63533e5ab221211b1863dcb34e