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

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

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

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