Merge changes from topic "aconfig-dump-format-and-filter-args" into main am: 9c80abc3

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



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