Changed implemented interface for CarrierRoamingNtnModeListener to CarrierRoamingNtnModeListenerWrapper2 and for SatelliteModemStateCallback to SatelliteModemStateCallbackWrapper2.

Needed to resolve errors related to adding the latest SatelliteClient.jar

Flag: EXEMPT test only
Bug: 363351600
Test: manual testing
Change-Id: Ic5358bbdd74272e4d5655c25980ea003229af14e
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
index 109ebbf..d8e6e7c 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
@@ -23,13 +23,13 @@
 import android.os.OutcomeReceiver;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.telephony.satellite.wrapper.CarrierRoamingNtnModeListenerWrapper;
+import android.telephony.satellite.wrapper.CarrierRoamingNtnModeListenerWrapper2;
 import android.telephony.satellite.wrapper.NtnSignalStrengthCallbackWrapper;
 import android.telephony.satellite.wrapper.NtnSignalStrengthWrapper;
 import android.telephony.satellite.wrapper.SatelliteCapabilitiesCallbackWrapper;
 import android.telephony.satellite.wrapper.SatelliteCommunicationAllowedStateCallbackWrapper;
 import android.telephony.satellite.wrapper.SatelliteManagerWrapper;
-import android.telephony.satellite.wrapper.SatelliteModemStateCallbackWrapper;
+import android.telephony.satellite.wrapper.SatelliteModemStateCallbackWrapper2;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -401,7 +401,7 @@
         }
     }
 
-    private class CarrierRoamingNtnModeListener implements CarrierRoamingNtnModeListenerWrapper {
+    private class CarrierRoamingNtnModeListener implements CarrierRoamingNtnModeListenerWrapper2 {
 
         @Override
         public void onCarrierRoamingNtnModeChanged(boolean active) {
@@ -431,7 +431,7 @@
         }
     }
 
-    private class SatelliteModemStateCallback implements SatelliteModemStateCallbackWrapper {
+    private class SatelliteModemStateCallback implements SatelliteModemStateCallbackWrapper2 {
         @Override
         public void onSatelliteModemStateChanged(int state) {
             String message = "Received onSatelliteModemStateChanged state: " + state;