Merge "Fix incorrect trusted hotword metric" into tm-qpr-dev