Merge cherrypicks of ['googleplex-android-review.googlesource.com/40478450'] into security-aosp-26Q2-release. Change-Id: Ic3b9085cbd20720ed2b07d781270df6c53395273