Android 16.0.0 release 4
Merge cherrypicks of ['googleplex-android-review.googlesource.com/35720280'] into 25Q4-release. Change-Id: I5acd1bad58d2504334f8e7c85172639641507e49