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