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

Change-Id: I0eff46b04a4f65f7fd4d483a78f2050410e26653