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

Change-Id: I9f061c535ad95554011c0988d617d6d37c02d7dc