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