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

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



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