[automerger skipped] Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into rvc-dev am: d198f5165c am: 886d492c8c am: f37a92b8c8 am: f32261c4c5 -s ours am: 59bcc039eb -s ours

am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 67e0292d0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475765

Change-Id: Ifd358771f56bdcb91b7a5d510a798f618fb770cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>