Merge "Support custom effect type UUID in audio effect AIDL example service" into main