Merge "Convert SDK API level to vendor API level for Android 15+ in VTS gates." into main