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 am: cdf11f04 am: 42f24e69

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



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