Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 0e67aa0cae

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

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