[automerger skipped] Merge "Add encapsulation type pcm." am: ad83caa8 am:...

[automerger skipped] Merge "Add encapsulation type pcm." am: ad83caa8 am: 282166ae am: 2adf150b -s ours

am skip reason: Merged-In I5970ca52ebfb581adee786ac0c9cbd0e083c6e1c with SHA-1 6bf08ea6 is already in history

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



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