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