Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into rvc-dev am: d198f5165c am: 886d492c8c am: f37a92b8c8

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

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