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

* aosp/android16-release:

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