Merge "Merge changes from topic "hotword-unbind-on-destroy" into udc-dev am:...

Merge "Merge changes from topic "hotword-unbind-on-destroy" into udc-dev am: 054c430b am: c6b515c1" into udc-d1-dev-plus-aosp am: 2710d609

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



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