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

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



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