[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: dbdfadc2 am: 08b34350 -s ours am: a2cb9b9a -s ours am: b9ec091c -s ours

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

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



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