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

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

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