Merge "Set the container field of aconfig flags" into main am: 7c186a5793

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2949210

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