[automerger skipped] Merge "Hotword: Add uid into the original metrics" into tm-qpr-dev am: aff32206 am: 5f8309a0 -s ours

am skip reason: Merged-In Ia49d5981be296c1143074774cc6c00fcc25671e6 with SHA-1 32707643 is already in history

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



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