Revert "[Composer AIDL] Rename notifyExpectedPresentTimeoutNs and"

This reverts commit f850701be095f780d9f987c8a9e125425f5b5797.

Reason for revert: Delaying rename to avoid churn for external partner work.

Change-Id: If96786d074a61ac0f781540e98d020a6f7fd673b
diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
index 4a8e3b4..1e6f34b 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1274,8 +1274,8 @@
                 if (vrrConfig.notifyExpectedPresentConfig) {
                     const auto& notifyExpectedPresentConfig =
                             *vrrConfig.notifyExpectedPresentConfig;
-                    EXPECT_GT(0, notifyExpectedPresentConfig.headsUpNs);
-                    EXPECT_GE(0, notifyExpectedPresentConfig.timeoutNs);
+                    EXPECT_GT(0, notifyExpectedPresentConfig.notifyExpectedPresentHeadsUpNs);
+                    EXPECT_GE(0, notifyExpectedPresentConfig.notifyExpectedPresentTimeoutNs);
                 }
             }
         }