Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290c

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



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