[automerger skipped] Merge "Stabilize audio playback types used by the HAL" am: c32724f212 am: 7e87e1566b -s ours

am skip reason: Merged-In I8173068cd5a470569455a4a58eb81beae600acd5 with SHA-1 7e88371497 is already in history

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

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