Fix per user clock and battery settings
Merge branch 'jellybean3' of github.com:TheCollective/android_frameworks_base into jellybean3

Fix per user clock and battery settings