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