Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp

* changes:
  Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee
  Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52