[automerger skipped] Merge "Stabilize audio playback types used by the HAL"...

[automerger skipped] Merge "Stabilize audio playback types used by the HAL" am: a1f8ad4b am: b8f986b7 -s ours am: 2f5ee798 -s ours

am skip reason: Merged-In I6cbe34d3b343fbefb0ae56e00dbf8360184e7b72 with SHA-1 a77d5552 is already in history

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



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