Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev

telephony/java/android/telephony/TelephonyManager.java

@@ -3639,6 +3639,8 @@ public class TelephonyManager {
         } catch (SettingNotFoundException e) {
             try {
                 int val = Settings.Global.getInt(cr, name);
+                Settings.Global.putInt(cr, name + subId, val);
+
                 /* We are now moving from 'setting' to 'setting+subId', and using the value stored
                  * for 'setting' as default. Reset the default (since it may have a user set
                  * value). */