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