Merge "audio test service guaranteed log" am: 6b466603c6 am: 0f3597e7d5

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

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