Merge "Set the container field of aconfig flags" into main am: 4c9375a4a8

Original change: https://android-review.googlesource.com/c/platform/development/+/2947996

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