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

Change-Id: I54f9234ba98d260392977b51a88aa1d105002c97