[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: c1064005 -s ours

am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 625e009f is already in history

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



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