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

Change-Id: I4fff4594da5f50789c0f3e2aedb46e8ada463892