[automerger skipped] Merge "Support custom effect type UUID in audio effect AIDL example service" into udc-qpr-dev am: 58552b4fe8 -s ours am: 9f9fc04ace -s ours

am skip reason: Merged-In I558958cc42c6c4a304e0ab1239ddefec9575a5af with SHA-1 80e5850d82 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24108109

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