Android Security 15.0.0 Release 17 (15848676)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/40534528'] into security-aosp-24Q3-release.

Change-Id: If41e53c7537a66127eefa0849a9ba4786c8628f6