Merge cherrypicks of ['googleplex-android-review.googlesource.com/40520730'] into security-aosp-26Q2-release.

Change-Id: Ief17d60f12e0253818cfb1d7c6a3d733db684fb7