Merge "Fix incorrect trusted hotword metric" into tm-qpr-dev am: 43f386b3

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



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