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

Change-Id: I67afbe1ece69fec67adc34f81b3d40f0b2d813fe
OSZAR »