Merge "Move encapsulation info fields to stable types" am: 692bb92e4d am: 341a7875a0

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

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