[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: f223b959 am: 5073cd1d -s ours am: 73e15828 -s ours am: 9bedd880 -s ours am: d6aceb36 -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/+/23475497



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