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

[automerger skipped] Merge "[BUG] audio: Misalignement of Native/Java AudioAttributes" am: 47818c0a am: 945efda1 am: ac59c88b -s ours am: c3837159 -s ours am: c6835314 -s ours am: 3dd1bdaf -s ours

am skip reason: Merged-In I13d216814db66369ae72b496f4c9ae724cc40561 with SHA-1 7a89e9fb is already in history

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



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