Add VERSION_CODES constant for S

This is a subset of the commit ed460aa1868e969880dd88a1ecef483de21ea34e
from internal master.

Note: The CL used for the Merged-in tag is irrelevant to this change but
achieves the desired automerging effects.

Test: No
Merged-In: If5c3b92063b8d9fb3f9b6272eb2cfef448065380
Change-Id: I205766a281eb3956c3d122f5358fe5c984803e6e
2 files changed