[automerger skipped] CSD: add support for multiple sound dose HALs am: 08c8c4b8ab -s ours am: 402dbf3384 -s ours

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

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

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