Merge "API Review Feedbacks" am: 3d2b3a114b am: 25693b816a

Change-Id: I4854155fb0c5cd85239afa2b3ff695fd6d9603ee

telephony/java/android/telephony/CarrierConfigManager.java

@@ -4367,6 +4367,7 @@ public class CarrierConfigManager {
         } catch (RemoteException ex) {
             Rlog.e(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null"
                     + ex.toString());
+            ex.rethrowAsRuntimeException();
         }
         return "";
     }

telephony/java/android/telephony/ModemActivityInfo.java

@@ -201,7 +201,7 @@ public final class ModemActivityInfo implements Parcelable {
     }
 
     /**
-     * Indicate if the ModemActivityInfo is invalid due to modem's invalid reporting.
+     * Indicates if the modem has reported valid {@link ModemActivityInfo}.
      *
      * @return {@code true} if this {@link ModemActivityInfo} record is valid,
      * {@code false} otherwise.