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

Merge changes from topic "hotword-unbind-on-destroy" into udc-dev am: 054c430b am: b923cbee am: 7b756408

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



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