Merge "Merge "SoundTrigger test cleanup" into udc-dev am: 9d0194cb" into...

Merge "Merge "SoundTrigger test cleanup" into udc-dev am: 9d0194cb" into udc-mainline-prod am: 644cf09f

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



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