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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I057bfdf8528b6f801fd5eb7d0757f19e81efa9a0