[automerger skipped] Merge "Allow duplicate release config maps and build flag...

[automerger skipped] Merge "Allow duplicate release config maps and build flag declarations" into main am: afac5b33 am: 8207e643 -s ours

am skip reason: Merged-In I18316e769438f62071723771762d6e89be98b813 with SHA-1 ff11fd70 is already in history

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



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