Merge "[automerger skipped] Merge "Merge "Adds Assistant invocation logging to...

Merge "[automerger skipped] Merge "Merge "Adds Assistant invocation logging to statsd" into rvc-dev am: a4939de5 am: 3262de7c" into rvc-d1-dev-plus-aosp am: 485c6ba1 -s ours" into rvc-qpr-dev-plus-aosp am: c9efa8c6 -s ours

am skip reason: Change-Id I738278c0a3e1ab42b53300792bfd80ae778d6be1 with SHA-1 e464028d is in history

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

Change-Id: Iea380b476c01adc36e5c5fb00c839b5069d5e183