Merge remote-tracking branch 'remotes/origin/upstream/main' into HEAD Change-Id: I4d120e856d72b26409af5592e5165a114613bc5e Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/system/logging/+/1122872 Reviewed-by: Adam Barth <abarth@google.com>