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 am: c22d6f4f am: 268cc453

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



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