Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee

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

Change-Id: Ib159b2dba25c32a6e252b0a56db1deb2c723d04b