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