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

[automerger skipped] Merge "Adds Assistant invocation logging to statsd" into rvc-dev am: a4939de5 am: aded7056 am: 6b16f2d2 am: bdc060dc -s ours

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

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

Change-Id: Ic52d5aee65430b8dc3bda2a00644d20be4e1249c