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

Change-Id: Id71e960138d6c4b12a70d3007844e7be698395df