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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33824526', 'googleplex-android-review.googlesource.com/34329735', 'googleplex-android-review.googlesource.com/35131275', 'googleplex-android-review.googlesource.com/34714591', 'googleplex-android-review.googlesource.com/36030622'] into security-aosp-24Q3-release.

Change-Id: I98dc5fc4de4461150f4c36104529c454fe995c1c