[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: 67e0292d -s ours am: 45d9b458 -s ours am: 1e6c0550 -s ours am: 30589a56 -s ours am: 8bf3b370 -s ours am: 332ad566 -s ours

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

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



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