Merge "Add VERSION_CODES constant for S" am: dfe33cb756 am: 230a340757

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

Change-Id: I3ead6dc8599c4327b15138de931bd3c8392f8953