[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: 59bcc039 -s ours am: 0601f864 -s ours am: 00f6c44c -s ours am: cc7f2691 -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: I5b2b531f4fa6764a8d36ceb314e9e46f55ec2efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>