[automerger skipped] Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: dbdfadc24c am: 65adcc7a90 -s ours am: cebcf126e5 -s ours am: 51a5d8547b -s ours
am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 f223b95992 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475240
Change-Id: I1ec8725591161c05ce24f503a99a0bc238360929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: