Merge "[Spa] Upgrade AGP to 8.5.0" into main