Make sure primary audio zone has highest priority

Did also code cleanup including
- Remove unused variable
- Prefer package private to public

Bug: 131090322
Test: dumpsys car_service | grep -A70 CarAudioService
Change-Id: I48b2e870cc9d259f84ee506fd6504985d5032534
2 files changed