Merge "CarAudioFocus: Fix requesting AF from a client that already holds it."