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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435aebb51bd0bd0ed3eb68460eb864c1e78e1874