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

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



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