Merge "Cleaned up the flag enable_identifier_disclosure_transparency_unsol_events" into main

src/com/android/settings/network/CellularSecurityPreferenceController.java

@@ -72,7 +72,6 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
     @Override
     public int getAvailabilityStatus() {
         if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
                 || !Flags.enableModemCipherTransparencyUnsolEvents()
                 || !Flags.enableModemCipherTransparency()) {
             return UNSUPPORTED_ON_DEVICE;

src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java

@@ -60,8 +60,7 @@ public class CellularSecurityNotificationsDividerController extends
 
     @Override
     public int getAvailabilityStatus() {
-        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
-                || !Flags.enableModemCipherTransparencyUnsolEvents()
+        if (!Flags.enableModemCipherTransparencyUnsolEvents()
                 || !Flags.enableModemCipherTransparency()) {
             return UNSUPPORTED_ON_DEVICE;
         }

src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java

@@ -178,8 +178,7 @@ public class CellularSecurityNotificationsPreferenceController extends
     }
 
     private boolean areFlagsEnabled() {
-        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
-                || !Flags.enableModemCipherTransparencyUnsolEvents()
+        if (!Flags.enableModemCipherTransparencyUnsolEvents()
                 || !Flags.enableModemCipherTransparency()) {
             return false;
         }