Merge cherrypicks of ['googleplex-android-review.googlesource.com/35130609', 'googleplex-android-review.googlesource.com/37476125'] into security-aosp-24Q3-release. Change-Id: Id40ce400089e3095973f78e16747d04e1a1b0f1d