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