Merge "fixup '[BUG] audio: misalignement of native/java AudioAttributes'" into tm-qpr-dev