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

Change-Id: Id14fe7bc2de9abf0f7ce1ee42a6b1533281b294a