[automerger skipped] Merge "CSD: add support for multiple sound dose HALs"...

[automerger skipped] Merge "CSD: add support for multiple sound dose HALs" into udc-qpr-dev-plus-aosp am: a86a3cda -s ours

am skip reason: Merged-In I7941e34c08496781f4393358d1ce2845d525b86c with SHA-1 b1c53787 is already in history

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



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