Snap for 12755599 from 7ee893e4777fca75b790301fe38360dceb115c25 to 25Q1-release

Change-Id: I732074e2597c0747b35668b94e14848b7c3b9270
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
index 6562e5c..b4c55d1 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -1385,7 +1385,7 @@
    */
   public void requestSatelliteDisplayName(
           @NonNull @CallbackExecutor Executor executor,
-          @NonNull OutcomeReceiver<String, SatelliteExceptionWrapper> callback) {
+          @NonNull OutcomeReceiver<CharSequence, SatelliteExceptionWrapper> callback) {
     if (mSatelliteManager == null) {
       logd("requestSatelliteDisplayName: mSatelliteManager is null");
       executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError(
@@ -1395,9 +1395,9 @@
     }
 
     OutcomeReceiver internalCallback =
-            new OutcomeReceiver<String, SatelliteException>() {
+            new OutcomeReceiver<CharSequence, SatelliteException>() {
               @Override
-              public void onResult(String result) {
+              public void onResult(CharSequence result) {
                 callback.onResult(result);
               }