Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0

Author: Amith Yamasani

core/java/android/provider/Settings.java

@@ -4087,7 +4087,9 @@ public static final String getBluetoothInputDevicePriorityKey(String address) {
             MOUNT_UMS_AUTOSTART,
             MOUNT_UMS_PROMPT,
             MOUNT_UMS_NOTIFY_ENABLED,
-            UI_NIGHT_MODE
+            UI_NIGHT_MODE,
+            LOCK_SCREEN_OWNER_INFO,
+            LOCK_SCREEN_OWNER_INFO_ENABLED
         };
 
         /**