Merge "[automerger skipped] Merge "Use Settings.System.getIntForUser instead...

Merge "[automerger skipped] Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into rvc-dev am: d198f516 am: 886d492c am: f37a92b8 am: f32261c4 -s ours am: 59bcc039 -s ours am: 0601f864 -s ours am: 00f6c44c -s ours am: cc7f2691 -s ours am: 364e0577 -s ours am: 36a33a8b -s ours" into udc-qpr-dev-plus-aosp