Merge "[hotword] avoid potential race condition / memory leak" into udc-dev...

Merge "[hotword] avoid potential race condition / memory leak" into udc-dev am: ce28981b am: 371958d3

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



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