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

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



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