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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30866016', 'googleplex-android-review.googlesource.com/30851555', 'googleplex-android-review.googlesource.com/30961573', 'googleplex-android-review.googlesource.com/30842512', 'googleplex-android-review.googlesource.com/28785016', 'googleplex-android-review.googlesource.com/31171245', 'googleplex-android-review.googlesource.com/31325670', 'googleplex-android-review.googlesource.com/31526440', 'googleplex-android-review.googlesource.com/31451948', 'googleplex-android-review.googlesource.com/31451077', 'googleplex-android-review.googlesource.com/31574310', 'googleplex-android-review.googlesource.com/31562674'] into security-aosp-24Q3-release.

Change-Id: Id7d6f22a2e44299d74464b5438671ddcc20e7391