SF: Rename HwcConfigIndexType to DisplayModeId

Bug: 159590486
Bug: 176148651
Test: atest libsurfaceflinger_unittest

Change-Id: Ie177b213bb7a8ab9f67a51d2b5cf27d8fd97b780
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index ca67935..6350144 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -318,7 +318,7 @@
     displayData.modes.clear();
     for (auto configId : configIds) {
         auto mode = DisplayMode::Builder(configId)
-                            .setId(HwcConfigIndexType(displayData.modes.size()))
+                            .setId(DisplayModeId(displayData.modes.size()))
                             .setWidth(getAttribute(hwcDisplayId, configId, hal::Attribute::WIDTH))
                             .setHeight(getAttribute(hwcDisplayId, configId, hal::Attribute::HEIGHT))
                             .setVsyncPeriod(getAttribute(hwcDisplayId, configId,
@@ -674,7 +674,7 @@
 }
 
 status_t HWComposer::setActiveModeWithConstraints(
-        PhysicalDisplayId displayId, HwcConfigIndexType modeId,
+        PhysicalDisplayId displayId, DisplayModeId modeId,
         const hal::VsyncPeriodChangeConstraints& constraints,
         hal::VsyncPeriodChangeTimeline* outTimeline) {
     RETURN_IF_INVALID_DISPLAY(displayId, BAD_INDEX);