Merge "Only include this partition's flags in aconfig_flags.pb" into main am:...

Merge "Only include this partition's flags in aconfig_flags.pb" into main am: 8522c2e8 am: f0acd82b

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



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