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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31654309', 'googleplex-android-review.googlesource.com/32207148', 'googleplex-android-review.googlesource.com/31299540', 'googleplex-android-review.googlesource.com/32333644', 'googleplex-android-review.googlesource.com/32470768', 'googleplex-android-review.googlesource.com/32628660', 'googleplex-android-review.googlesource.com/32773609', 'googleplex-android-review.googlesource.com/32221941', 'googleplex-android-review.googlesource.com/32482277', 'googleplex-android-review.googlesource.com/32648970'] into security-aosp-24Q3-release.

Change-Id: Icf4df843de21886acdc86afcda74287614540eba