[automerger skipped] Merge "Improve failure logging in AudioHealthTest" am:...

[automerger skipped] Merge "Improve failure logging in AudioHealthTest" am: 7e7b547d am: c02a7100 am: 8d14fc24 -s ours am: 6404f20e -s ours

am skip reason: Change-Id I157b6779b8426dd8601c20ee07ecf414850fb09e with SHA-1 edc7e4fb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc253cd163f39b5fb19338681c558c2a08b345f4