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

Change-Id: I63be68ce97946e5f9c4fc6598f61ce9f2898b1fe