Merge "Merge "Add config to show assistant above the dream" into rvc-dev am: 4cb9d5d9 am: 92a690cc" into rvc-d1-dev-plus-aosp