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

* aosp/android16-release:

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