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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29330175', 'googleplex-android-review.googlesource.com/30695129', 'googleplex-android-review.googlesource.com/30514584', 'googleplex-android-review.googlesource.com/30514585', 'googleplex-android-review.googlesource.com/30514586', 'googleplex-android-review.googlesource.com/30387612'] into security-aosp-24Q3-release.

Change-Id: Ibb85eefc956ec8fe3e2c5b11a05534b8d6ba988e