[automerger skipped] Merge Android 12L am: 5a99ecca51 -s ours am: 332e91c18e -s ours

am skip reason: Merged-In I5a1a097713ee39dd36a1354fc134e2b7bb04ec33 with SHA-1 eedbe3cf20 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2013276

Change-Id: If6f3ac42e4d97986ef956b0edeaf23050984425e