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

Change-Id: Ie0cdf0b31369c6baeb57f8ac84454ba3e28dc139