Merge cherrypicks of ['googleplex-android-review.googlesource.com/37981251', 'googleplex-android-review.googlesource.com/38158081', 'googleplex-android-review.googlesource.com/38125233', 'googleplex-android-review.googlesource.com/37405465', 'googleplex-android-review.googlesource.com/38356770', 'googleplex-android-review.googlesource.com/38485339', 'googleplex-android-review.googlesource.com/38504094', 'googleplex-android-review.googlesource.com/38516460', 'googleplex-android-review.googlesource.com/39224389', 'googleplex-android-review.googlesource.com/39347149'] into security-aosp-24Q3-release.

Change-Id: I3ae7801b1bf1391537b516f7d14f214bc0a9fdd1