Merge cherrypicks of ['googleplex-android-review.googlesource.com/31116452',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31116452', 'googleplex-android-review.googlesource.com/30811115', 'googleplex-android-review.googlesource.com/30684702', 'googleplex-android-review.googlesource.com/31592951', 'googleplex-android-review.googlesource.com/31584425', 'googleplex-android-review.googlesource.com/31583379', 'googleplex-android-review.googlesource.com/31789962', 'googleplex-android-review.googlesource.com/32102394', 'googleplex-android-review.googlesource.com/31995061', 'googleplex-android-review.googlesource.com/31997925', 'googleplex-android-review.googlesource.com/31995123', 'googleplex-android-review.googlesource.com/31191873', 'googleplex-android-review.googlesource.com/31191626'] into security-aosp-24Q3-release.

Change-Id: Ie2a5c18057e18190e2bbeafdb52378d34d56200f