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

Change-Id: I88cfcc22c165fb37246089bf9110bc69283598bd