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

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



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