Merge "Merge "Re-enable the removed-from-presubmit hotword tests (framework...

Merge "Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a am: b9070311" into tm-d1-dev-plus-aosp am: f770f422 am: b298744b

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



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