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

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3068622



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