Merge 'aosp/android16-release' into 'aosp/main-kernel'

* aosp/android16-release:

Bug: 425899940
Change-Id: I332095dae887a8932a6fafe50098e0b0af5defc2
Signed-off-by: Giuliano Procida <gprocida@google.com>