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

Change-Id: Ie583da6f2ec6657b4c0d94b5f2b9b6899335f8f8