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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157215', 'googleplex-android-review.googlesource.com/31394831', 'googleplex-android-review.googlesource.com/31391168'] into security-aosp-24Q3-release.

Change-Id: I8426c9c9ff64c4266685a089df5d22b16a763a48