Merge "Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c3 am: e9412cf6" into tm-qpr-dev am: 2adfd136

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



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