[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 am: 824884e4 -s ours am: 7548f1b7 -s ours am: 486d467b -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: Id162c86a5fdb3e359a868a894a9053e8ab16cc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>