Merge cherrypicks of ['googleplex-android-review.googlesource.com/34018970'] into security-aosp-24Q3-release. Change-Id: Ice804a038bac3aff3a07c28555784a601b235c58