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

Change-Id: I7bf90772bca936f1392b7e71fe99dd4c410dbc46