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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30686357', 'googleplex-android-review.googlesource.com/31686511', 'googleplex-android-review.googlesource.com/31743864', 'googleplex-android-review.googlesource.com/31995154'] into security-aosp-24Q3-release.

Change-Id: I438f4f9ebec2d8bbae46c0d78f768ab3eddac62d