DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""

This reverts commit 38a7ec8cc562c5b9077b12ab4c9059096d47d357.

Change-Id: I34e5bb8e134e1199dd3af8ae39f6925a886f5134
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e2f2c8d..a364e22 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1282,6 +1282,7 @@
         </activity>
 
         <activity android:name=".managedprovisioning.ByodHelperActivity">
+                android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="com.android.cts.verifier.managedprovisioning.BYOD_QUERY" />
                 <action android:name="com.android.cts.verifier.managedprovisioning.BYOD_REMOVE" />
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
index 800137a..90912ea 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
@@ -196,6 +196,12 @@
     }
 
     @Override
+    public void onConfigurationChanged(Configuration newConfig){
+        Log.v(TAG,"onConfigurationChanged");
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case REQUEST_INSTALL_PACKAGE: {