[automerger skipped] Fix passing of ExtraAudioDescriptors to audio HAL am:...

[automerger skipped] Fix passing of ExtraAudioDescriptors to audio HAL am: 0566bac8 am: 79d04687 am: 7d9c0996 am: 2f0fabd2 am: e6946447 -s ours

am skip reason: Merged-In Ie12b72b28916d774827ce3dff038700016033201 with SHA-1 ddc5f31f is already in history

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



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