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

Change-Id: I088eb0df70683a3b392c76ea4112435f02f96818