Merge "Add filter by container to aflags" into main am: f52e8788 am: 09fbb10f

Original change: https://android-review.googlesource.com/c/platform/build/+/3087903



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