Merge "pal: ensure combo device routing when a2dp is resumed"