Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1 am: 36e1dd53f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f3416d79ce8936f44edcf87231b902ea875f1d1
tree: 9bf4c026f812cb1d1d9896c6a6e3a7634edcca49
  1. core/
  2. services/