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