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

* aosp/android16-release:

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