[automerger skipped] Merge "Fix incorrect trusted hotword metric" into...

[automerger skipped] Merge "Fix incorrect trusted hotword metric" into tm-qpr-dev am: 43f386b3 am: a5b7eabc -s ours

am skip reason: Merged-In I5ab23ccc88c0c1221a2b2843f90f787346df41b7 with SHA-1 550ff9e2 is already in history

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



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