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

Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a am: 5cdd3ce8

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



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