Merge "Use Tiramisu instead of T in supported_build_releases" am: 52aad81d45 am: fcb871ac39 am: 5bf9b0691e

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

Change-Id: I7cafe524a8dbd8b7af91b5ebad1bd31829c2223b
diff --git a/android/api_levels.go b/android/api_levels.go
index 926d297..de56625 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -321,6 +321,7 @@
 			"Q":     29,
 			"R":     30,
 			"S":     31,
+			"S-V2":  32,
 		}
 
 		// TODO: Differentiate "current" and "future".
@@ -364,6 +365,7 @@
 			"Q":     29,
 			"R":     30,
 			"S":     31,
+			"S-V2":  32,
 		}
 		for i, codename := range config.PlatformVersionActiveCodenames() {
 			apiLevelsMap[codename] = previewAPILevelBase + i