Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into...

Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbff am: 3242266a

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



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