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

* aosp/android16-release:

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