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

Change-Id: Ife635c470eb70b8d650ee509c455a286d82041bd