audio: Fix some VTS issues on real devices am: 69d60aa02c am: 677c969ad7

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

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