Merge branch 'upstream/main' into 'main' Change-Id: I3e429f225a70663e537dcfff532f3c7fa5a235d3 Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/system/logging/+/1476936 Reviewed-by: Nathaniel Manista <nathaniel@google.com>