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: dbdfadc2 am: 65adcc7a -s ours am: cebcf126 -s ours am: 1548f0f8 -s ours am: de9e8f14 -s ours" into udc-qpr-dev-plus-aosp