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