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: I556100abba7449b68e434469bf7b589690327e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>