Merge "ESQueue: do not merge aac packets" into lmp-dev