Merge changes from topic "default-pvmfw-image" am: b3be181687 am: ab1d0dc36e am: 6308e21f92 am: 0ce85eaf51

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

Change-Id: Ia0e2e41a82c4ba212e815df9d9507e98ce419f00
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8432513..2b63a3e 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