Merge 'upstream/main' into 'main' Change-Id: I447cdfb9a7257636b9df46f45125028621cbe3b6 Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/system/libfmq/+/1059082 Reviewed-by: Benjamin Lerman <qsr@google.com>