Merge remote-tracking branch 'aosp/upstream-master' am: 5a3eaeb9f2

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

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