Merge "[automerger skipped] Use Settings.System.getIntForUser instead of...
Merge "[automerger skipped] Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: f223b959 -s ours am: 7f4ecdc8 -s ours am: 905acea6 -s ours"