Merge changes from topic "hotword_qpr" into tm-qpr-dev am: 7811c2b7

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



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