Fix bug: allow users to select "none" for lockscreen widget

Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
Fix strings

Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
Fix regulatory information dialog appearance

Bug 7081675

Replace RegulatoryInfoFragment with a custom preference so that the info
shows up properly in a dialog. DialogFragments do not appear
as dialogs when instantiated from preference XML files.

Change-Id: Icbdf73bd5b1d14f28a01d7b9cb0f37d90340eb46
Merge "Fix strings" into jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
Fix a crash in InstalledAppDetails

Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
Omit PPTP VPNs from lockdown list.

Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
Load user photos through system_server.

Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
Fix NPE in DeviceInfoSettings

Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
Migrate UI to supportsMultipleUsers().

Bug: 7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
Fix a crash in InstalledAppDetails

Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
Fix NPE in DeviceInfoSettings

Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
Update string to reflect removed users.

Bug: 7194784
Change-Id: Ied3b4376d0ad664c61a5d3388fe24bc96c6ee466
Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
Merge "Update string to reflect removed users." into jb-mr1-dev