Merge "Set the container field of aconfig flags" into main am: 0151f72e am: 4366c216

Original change: https://android-review.googlesource.com/c/platform/build/+/2947281



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