[automerger skipped] Merge "Improve failure logging in AudioHealthTest" am: 7e7b547d07 am: c02a71008b am: 8d14fc240d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib067795af6958bf3114cecb7924139a7e9e4e3c4