[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: eedbe3cf20 -s ours

am skip reason: Merged-In Id413c094b1276c3ba2577d8f51cdfd2b48adb09f with SHA-1 c8c39af172 is already in history

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

Change-Id: I839cc0f6bda3683132b33e8f7f4ba92b4a1fc170