Also,
- Upgrade gradle to 8.5

Bug: 303768224
Test: Gradle Sync
Test: Run Gallery
Change-Id: I7133df6697c6b7321d1f4e1c3a3622fa85f2f3de