[automerger skipped] Merge "Ensure GWP-ASan CTS runs in tombstone management...

[automerger skipped] Merge "Ensure GWP-ASan CTS runs in tombstone management presubmit" into udc-dev am: e7e7d72f am: 1d537f00 am: 28d3f07f am: 71b2eee1 -s ours

am skip reason: Merged-In I4987685fe0d61f35932989971c0561ed1fb02414 with SHA-1 d596ff18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23288270



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