Merge "[Satellite] Show category of Your data plan with Manual connection type." into main

src/com/android/settings/network/telephony/satellite/SatelliteSettingAccountInfoController.java

@@ -101,6 +101,10 @@ public class SatelliteSettingAccountInfoController extends TelephonyBasePreferen
 
     @Override
     public int getAvailabilityStatus(int subId) {
+        if (mConfigBundle.getInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT)
+                == CARRIER_ROAMING_NTN_CONNECT_MANUAL) {
+            return AVAILABLE;
+        }
         return mConfigBundle.getBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;