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

Change-Id: Id71efa468ae0c89c7109a3cd5209acb02d088485