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

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



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