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