[automerger skipped] [automerged blank] Merge remote-tracking branch 'aosp/upstream-master' to 'aosp/master' for external/ruy. 2p: 380f85132f am: ce41e9d6f0 -s ours

am skip reason: Merged-In I71df6832de5c6fb310e9c2c97cdf361fc9074e80 with SHA-1 0cdefb826c is already in history

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

Change-Id: I52860e7e7e6a5d483491f095fe7affd6d450adea