[automerger skipped] Merge changes from topic "hotword_qpr" into tm-qpr-dev...

[automerger skipped] Merge changes from topic "hotword_qpr" into tm-qpr-dev am: 7811c2b7 am: fe8eba1b -s ours

am skip reason: Merged-In Iee6ab086ccc3f27b95ee601d6be11231f300170c with SHA-1 65290802 is already in history

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



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