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

Change-Id: I677f5f91ff8951ef6ce6b25b799beb475b043feb