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