Merge "libaudiohal@aidl: fix drain as per HIDL" into main am: 361be945d2 am: 75c125c0e2

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

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