am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev

* commit 'e4e520641d7c0b2b173a830dcd7a5a2bcb767ebf':
  Do not throw exception when MeasurementDetails.mediaSize is empty

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

@@ -527,8 +527,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
                 }
             }
         } else {
-            throw new IllegalStateException(
+            Log.w(TAG, "MeasurementDetails mediaSize array does not have key for user " + userId);
-                    "MeasurementDetails mediaSize array does not have key for user " + userId);
         }
         return total;
     }