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

* aosp/android16-release:

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