Merge remote-tracking branch 'remotes/origin/upstream/main' into HEAD

Change-Id: I0651026550ef2dd482b129efe431509c8a723154
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/system/libhwbinder/+/1122589
Reviewed-by: Adam Barth <abarth@google.com>