Merge "Merge "Add support for onReject and onError for external hotword." into...

Merge "Merge "Add support for onReject and onError for external hotword." into tm-dev am: 90579f32 am: 5ec4c563 am: 7ac353df" into tm-qpr-dev-plus-aosp am: 9b8acca1

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



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