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

Change-Id: Ie23e5ab152afb1c02063abffda9a1130f0065401
OSZAR »