[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of...

[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 383c687f am: c9346da1 -s ours

am skip reason: contains skip directive

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



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