Merge "Add encapsulation type PCM." am: a4f25fd18f am: 0f034dc9e1

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

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