Merge "audio test service guaranteed log" am: 6b466603 am: 0f3597e7 am: d12b7385

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



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