Merge "Use Settings.System.getIntForUser instead of getInt to make sure user...

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

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



Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f37a92b8c8c98ca40f858782fe3720362565c16c)
Merged-In: Idda8cdb4c853b6046ba19d35eeea2a1a6ee73541
Change-Id: Idda8cdb4c853b6046ba19d35eeea2a1a6ee73541