Merge remote-tracking branch 'aosp/upstream-staging' into merge_to_main_netty

Bug: 319629150
Bug: 304217500
Change-Id: Ic0e92e56b1ff2f1b33f18e2c4c6ecdbe39010408