Merge "Add VERSION_CODES constant for S" am: dfe33cb756

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

Change-Id: Ib41868f0c19d300fbbf0f5cc3cbf922ef4ece5b8