Merge "Stabilize audio playback types used by the HAL" am: a1f8ad4b13

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

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