Merge "re-add swcodec payload to mixed staging allowlist" am: 0b2cb610 am:...

Merge "re-add swcodec payload to mixed staging allowlist" am: 0b2cb610 am: d5522fa7 am: 288e01bb

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



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