Merge "Introduce WifiDisplayCertPreferenceController"

diff --cc src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index f6c6926,0445a06..65fb239
--- 1/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
--- 2/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@@ -199,10 -199,10 +199,10 @@@ public class DevelopmentSettingsDashboa
          // logger buffer sizes
          // store logger data persistently on device
          // telephony monitor
 -        // camera laser sensor
 +        controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
          // camera HAL HDR+
          // feature flags
-         // wireless display certification
+         controllers.add(new WifiDisplayCertificationPreferenceController(context));
          // enable wi-fi verbose logging
          // aggressive wifi to mobile handover
          // always allow wifi roam scans