[automerger skipped] Merge "Relax ThemeHost comparison" into nougat-cts-dev am: 0ad1833d -s ours skipped: c98a45d0 Change-Id: I60a05b44ef1d8b75d6faf8a9376748c03d50acfb