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