Android Security 16.0.0 Release 4 (14733871)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/35620474'] into 25Q2-release. Change-Id: I9dee6a0a42d01c2e0849b95747385d4b1f8dd993