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

am skip reason: Merged-In I474d2d29323360da79ac998b15628b2c1c31e7a9 with SHA-1 2118fe8b98 is already in history

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

Change-Id: I1804d1fceeae2487585f8655648f56d5ce86577c