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

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

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