[automerger skipped] Merge "Filter read-only + disabled flags from...

[automerger skipped] Merge "Filter read-only + disabled flags from aconfig_flags.pb" into main am: 59de3af2 am: 63e08329 -s ours

am skip reason: Merged-In I9a1d3d3589246b650326f8770209401ca388a734 with SHA-1 5730ce71 is already in history

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



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