Merge changes from topic "am-7e5bbb7d22d5483a88e097cac4d646e6" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into sc-v2-dev am: 4bd3d6d4 -s ours am: 84c7c36e -s ours am: e0f11dcf -s ours am: d5ffd208 -s ours am: 1fb6850b -s ours am: 0234d009 -s ours
  [automerger skipped] Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: 67e0292d -s ours am: 45d9b458 -s ours am: 46c5f994 -s ours am: 29292beb -s ours am: 30234b9f -s ours am: 5e39cd06 -s ours