[automerger skipped] Merge "Add AUDIO_ENCAPSULATION_TYPE_PCM." am: f49af6b6...

[automerger skipped] Merge "Add AUDIO_ENCAPSULATION_TYPE_PCM." am: f49af6b6 am: 32d6ff68 am: ddf8c69f -s ours

am skip reason: Merged-In I42ccbed4d0b2a2cd7d704ac42b1aa25b1e128de3 with SHA-1 b099c1e9 is already in history

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



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