Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev...

Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev am: 8e3c3bd2 am: 535e6b4c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23260396



Change-Id: I83c060dd5362d8ebceb1c3ef70376e4a78450a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>