Merge "Remove VersionCodes values from CorePlatformApi" am: 160ce0a08b

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1486178

Change-Id: I34153033cd55ada48b867de5721c32d6c0809dbc