[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of...

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

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3068204



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