Merge "[automerger skipped] Use Settings.System.getIntForUser instead of...

Merge "[automerger skipped] Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: dbdfadc2 am: 65adcc7a -s ours am: cebcf126 -s ours am: 1548f0f8 -s ours am: de9e8f14 -s ours" into udc-qpr-dev-plus-aosp am: 1520c13e -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/+/23475240



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