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

[automerger skipped] Merge "Ensure GWP-ASan CTS runs in tombstone management presubmit" am: 8b8ef77f am: 1bccc28d am: 7fa66a1e -s ours am: e7cfd86f -s ours am: a0a87b28 -s ours am: 7ef29755 -s ours

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

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



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