[automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am:...

[automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319b -s ours am: 78fcb463 -s ours am: 1c3d7c4c -s ours am: b8797dc8 -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: I58abfa37710d50ec9a10d547dc49f6a5d86d04a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>