[automerger skipped] Merge "[BUG] audio: Misalignement of Native/Java...

[automerger skipped] Merge "[BUG] audio: Misalignement of Native/Java AudioAttributes" am: b9b0db62 am: 16b0d2bc am: 4aea510c -s ours am: 8a6c3e0b -s ours

am skip reason: Merged-In I0aa6f19bb0f448e853adcc0dacece4d69c665602 with SHA-1 47e3b6bf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2598626



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