[automerger skipped] Merge "Migrates additional Assistant logging to Westworld" into rvc-dev am: 0ac895d9 am: b855eb42 -s ours am: 133508c3 -s ours

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

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

Change-Id: I168a058dbdaf1adc0e62bed3e4c541915187f7b5