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

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

Change-Id: I23208a971b1423d4a61ec70e935b0df6498a62ba