Merge "New test for propagation of CFI" am: 4ffcdad9 am: 50fd9e99 am: 4a52a502

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



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