Android Security 16.0.0 Release 2 (14094968)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32872852'] into 25Q2-release. Change-Id: Ia500ff519925b5872c697a7a31af229f0a5be61d