Merge cherrypicks of ['googleplex-android-review.googlesource.com/30937113', 'googleplex-android-review.googlesource.com/31017300'] into 25Q1-release.

Change-Id: I069a9491aa159b9f6cac38e689744d0bf54b97fa
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index 0a753b4..291780c 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -2865,6 +2865,8 @@
                 .setIsAllowed(allowed)
                 .setIsEmergency(isInEmergency())
                 .setResult(resultCode)
+                .setCarrierId(mSatelliteController.getSatelliteCarrierId())
+                .setIsNtnOnlyCarrier(mSatelliteController.isNtnOnlyCarrier())
                 .reportAccessControllerMetrics();
         mLocationQueryStartTimeMillis = 0;
         mOnDeviceLookupStartTimeMillis = 0;