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 am: cdd053d9

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



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