[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
-s ours am: bfec611d38
-s ours am: 49293d30cc
-s ours
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I4c90e1b4feab5c1462bd4691fd138a164460e366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: