Merge cherrypicks of ['googleplex-android-review.googlesource.com/36452741'] into security-aosp-24Q3-release.

Change-Id: Iebddc7394ddb71c5599d37f5d6df8654c6c68eab