[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 rvc-dev am: d198f516 am: 886d492c am: f37a92b8 am: f32261c4 -s ours

am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 67e0292d is already in history

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



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