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