Android 16.0.0 release 4
Merge cherrypicks of ['googleplex-android-review.googlesource.com/36804013'] into 25Q4-release.

Change-Id: I9baf8a225a0d853b52e9cf96139fd36a1e77f896