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

Change-Id: Iea7836478de37df0ed2f95dc6cf8579adc5ee39c