Merge "Support memtag_heap in SANITIZE_TARGET_DIAG, fix cc_test interation." am: 298bafdd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2be48d5a0572a91210c221ccb726b12936bfb166