Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev

am: 37c26e4

* commit '37c26e4d13235b9fd297f1d52e9d874b7e488fbf':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I66abed6e3719160f8e9a80dba4802a0435dc4012

telephony/java/android/telephony/SubscriptionManager.java

@@ -1347,6 +1347,7 @@ public class SubscriptionManager {
         if (subInfo != null) {
             newConfig.mcc = subInfo.getMcc();
             newConfig.mnc = subInfo.getMnc();
+            if (newConfig.mnc == 0) newConfig.mnc = Configuration.MNC_ZERO;
         }
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         DisplayMetrics newMetrics = new DisplayMetrics();