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