Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: 991261951a am: 5b255ed02a am: 07ad38c1ca

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

Change-Id: Ic97abe3f8434f4f894c7ecb654f7e1d158678197