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

Change-Id: I8b3bee8edc492fd07ef96f31c354f6bfdd6d897c