Merge "Fix allowlist in order to mixed_build the entire prod allowlist." am:...

Merge "Fix allowlist in order to mixed_build the entire prod allowlist." am: aa2e898e am: 136d93ab am: eca29c2b

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



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