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

[automerger skipped] Merge "Stabilize audio playback types used by the HAL" into tm-qpr-dev-plus-aosp am: 28fd3361 -s ours

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

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



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