[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
-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: I59268504ab66e848bdeb2fbad756ffee8d30ef2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: