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

Change-Id: I7a9e861ac3d8c79b8d22659f37b2a09da0f3bdf9