Revert "Update ActivityManagerConfigChangeTests for rotation."

Bug: 36812336
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerConfigChangeTests#testRotation180NoRelaunch
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerConfigChangeTests#testRotation180Relaunch
This reverts commit 55db3178264d4183afa002d9f0a9ac62ae3dccb5.

Change-Id: I63c6947d46853b4a3014b501a44996a353e79b28
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
index c8fd524..4640d19 100644
--- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
@@ -52,15 +52,13 @@
     }
 
     public void testRotation180Relaunch() throws Exception {
-        // Will receive a configuration change for rotation.
-        // TODO(b/36812336): reset configuration change count to 0 once configuration moved out.
-        testRotation(TEST_ACTIVITY_NAME, 2, 0, 1);
+        // Should receive nothing
+        testRotation(TEST_ACTIVITY_NAME, 2, 0, 0);
     }
 
     public void testRotation180NoRelaunch() throws Exception {
-        // Should receive one configuration change due to the rotation.
-        // TODO(b/36812336): reset configuration change count to 0 once configuration moved out.
-        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 2, 0, 1);
+        // Should receive nothing
+        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 2, 0, 0);
     }
 
     @Presubmit