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

Change-Id: I1982d2d5252bbf806c8c56d7f1ca566c9fe6834a