Merge changes from topic "am-daee9f97cbd14c45bcb87f2cf1687a45" into udc-d1-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: f043c946 -s ours am: bb923b6d -s ours am: 361f27c2 -s ours am: 5bf0296e -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: 1e6c0550 -s ours am: 30589a56 -s ours am: 8bf3b370 -s ours am: 09c45d3a -s ours