Merge cherrypicks of ['googleplex-android-review.googlesource.com/38449638'] into security-aosp-24Q3-release. Change-Id: I39d3ff95871feedfd8c21fb2a93d62fccc180085