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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30595743', 'googleplex-android-review.googlesource.com/29689248', 'googleplex-android-review.googlesource.com/29688663', 'googleplex-android-review.googlesource.com/29688664', 'googleplex-android-review.googlesource.com/30965242', 'googleplex-android-review.googlesource.com/31157007', 'googleplex-android-review.googlesource.com/31106431', 'googleplex-android-review.googlesource.com/31092845', 'googleplex-android-review.googlesource.com/30800590'] into security-aosp-24Q3-release.

Change-Id: I152139156ffec25bc87272cf5b73769548a63e6e