Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 89aad7ea5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3068602

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