Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b

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

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