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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28498672', 'googleplex-android-review.googlesource.com/28823468', 'googleplex-android-review.googlesource.com/28696275', 'googleplex-android-review.googlesource.com/28718563'] into security-aosp-24Q3-release.

Change-Id: I6755c02e4491b6e848c08ea70066a58ab252f99e