Android security 16.0.0 release 3
Merge cherrypicks of ['googleplex-android-review.googlesource.com/34241501'] into 25Q2-release. Change-Id: Ifbd4a31cac6a3e9b3c7e38088854529abf131895