[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 am: ea84ed07 -s ours am: e8cb3c5e -s ours

am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 0f79319b is already in history

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



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