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

Change-Id: I2a02b8a86d06802f22379c6d3b263eca0caa4dcc