Merge "Add missing container field to the aconfig flag file." into main am: 18a8ffa0

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



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