Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa8270

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I565eb522ff02784c36533be2eabb3267c2035991