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