Snap for 7921921 from ed2d364a to tm-d1-release

Change-Id: If04ec59f818169f25f0db22c238a9767142d828e

tests/c2_e2e_test/AndroidManifest.xml

@@ -20,6 +20,7 @@
         android:label="@string/app_name">
         <activity android:name=".E2eTestActivity"
                   android:launchMode="singleTop"
+                  android:configChanges="orientation|screenSize|screenLayout"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />