Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 am: 286c0c11b3 am: 639aa227b9

Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: I121ba436f746ffa21bde2602de4aa10bebf278cc
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 18d00ce..3d4598e 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -52,6 +52,7 @@
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
+PLATFORM_VERSION_CODENAME.SP2A := Sv2
 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 
 ifndef PLATFORM_SDK_VERSION