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

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



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