[automerger skipped] Use Settings.System.getIntForUser instead of getInt to...

[automerger skipped] Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: 220d16b1 am: 68512aea -s ours

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

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



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