Merge "Migrates additional Assistant logging to Westworld" into rvc-dev am: 0ac895d970

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

Change-Id: I4fa67151abeca9b219db96176b50f57cef8da71b