[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 0e67aa0cae am: 5a425dd548 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3068642

Change-Id: Ifc24339fdd7c9570098ba90612ff560e56a04b83
Signed-off-by: Automerger Merge Worker <[email protected]>