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

Bug: b/388873821
Change-Id: Ib1dcd18a097ba73e7a4839a5ffa3e2fc9b66594d
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/android.googlesource.com/platform/frameworks/native/+/1185892
Reviewed-by: James Robinson <jamesr@google.com>
tree: 58b2d714d01109c2d6cd20e15ab6c423f6880dee
  1. libs/