Android security 17.0.0 release 2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/40550193'] into security-aosp-26Q2-release.

Change-Id: Ieb2c1aba873d73c8db2a6a1a3b19b36c1fa6a604