Merge "Improve error handling for Trusted Hotword" into udc-dev am: 8aa0539e

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



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