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

Change-Id: Ic895b8c75efb14545d588c32f9f3355c09e2b600