[automerger skipped] [BUG] audio: misalignement of native/java AudioAttributes...

[automerger skipped] [BUG] audio: misalignement of native/java AudioAttributes am: f6d3bbe1 am: 741809e4 am: 3ce579e3 -s ours am: 67f91422 -s ours am: 97ec5bde -s ours

am skip reason: Merged-In Ie40576421aff595112740821ea002bc70354f512 with SHA-1 1e2b56f6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2598668



Change-Id: If7888769cab850238d9a575b9fae686f941a7e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>