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

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

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

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