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

[automerger skipped] Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into sc-v2-dev am: 4bd3d6d4 -s ours am: 84c7c36e -s ours am: f043c946 -s ours am: bb923b6d -s ours am: 3bb9a94a -s ours am: d44b2174 -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: I02f570775d527f2a2219e79d29913ba3f50576a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>