Merge "Move encapsulation info fields to stable types" am: 692bb92e am:...

Merge "Move encapsulation info fields to stable types" am: 692bb92e am: 341a7875 am: 6b9d2204 am: bbe94a6b

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



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