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

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



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