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

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

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