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

Change-Id: I333cd668724a0a453164ec61e1218d15870b3157