[automerger skipped] Merge "Migrates additional Assistant logging to...

[automerger skipped] Merge "Migrates additional Assistant logging to Westworld" into rvc-d1-dev-plus-aosp am: e52b335e am: d22b5664 -s ours

am skip reason: Change-Id I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e with SHA-1 139f3147 is in history

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

Change-Id: I4172494f0a29500a8b0f18dd4ed1b7b15f4199fa