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