Merge "Migrates additional Assistant logging to Westworld" into rvc-d1-dev-plus-aosp am: e52b335e19

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

Change-Id: I5364b995dcb9b6d98df5253a0488f38829c436c2