[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: d221c070d2 am: cdf979a600 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3068562

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