[automerger skipped] Merge "Audio: fix AudioVolumeGroup JNI" am: 0e2e9bb9...

[automerger skipped] Merge "Audio: fix AudioVolumeGroup JNI" am: 0e2e9bb9 am: 91b94092 am: ecfd02fa -s ours am: 353aabbb -s ours

am skip reason: Merged-In If6e0b5ba576f3fdf89480205639b1c2a4b722456 with SHA-1 2c5d09c4 is already in history

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



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