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