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

Change-Id: Id03b565c137a00ea2072d38cbd8f69657267be3e