Merge "Hotword: Add uid into the original metrics" into tm-qpr-dev am: aff32206

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



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