[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 am: 35b1ff92 -s ours am: d5b97c37 -s ours

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

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



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