Merge "Test changes to prepare for allowlist v2" into main am: c774c92f am:...

Merge "Test changes to prepare for allowlist v2" into main am: c774c92f am: c80520b8 am: 8a4f82bb am: fbb03a2b

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



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