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

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



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