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

* aosp/android16-release:

Bug: 425899940
Change-Id: I238e3c12abce518b6cf8d645a964acf21b6bd36d
Signed-off-by: Giuliano Procida <[email protected]>