[automerger skipped] Merge "Fix bug when memtag_heap in diag but not...

[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290c -s ours am: bfec611d -s ours am: 49293d30 -s ours am: c852882c -s ours

am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a676260 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238



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