[automerger skipped] Merge remote-tracking branch 'aosp/upstream-master' to 'aosp/master' for external/ruy. am: 0cdefb826c -s ours

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

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

Change-Id: I04e01c177512f705aba62283cb12ba0c33918ed6