Android Security 16.0.0 Release 6 (14982922)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33624085'] into 25Q2-release.

Change-Id: Ie2c544d1e9a9d31bdc3fdbd6e0942d2c45606501