[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 udc-dev am: 5c19dbf5 am: 1eb44aed -s ours

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

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



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