Merge "Attempt to fix AssistantStackTests presubmit flakiness" into tm-dev
diff --git a/tests/framework/base/windowmanager/app/AndroidManifest.xml b/tests/framework/base/windowmanager/app/AndroidManifest.xml
index 804e0e7..be93126 100755
--- a/tests/framework/base/windowmanager/app/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/app/AndroidManifest.xml
@@ -350,6 +350,7 @@
 
         <activity android:name=".AssistantActivity"
              android:exported="true"
+             android:configChanges="orientation|screenSize|screenLayout"
              android:screenOrientation="locked"/>
         <activity android:name=".TranslucentAssistantActivity"
              android:exported="true"