Android security 16.0.0 release 7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/38671038'] into 25Q2-release.

Change-Id: I5b6bd196a336e8b36e5e51c4f2742eded62b78e4