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

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

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