Merge cherrypicks of ['googleplex-android-review.googlesource.com/31654309', 'googleplex-android-review.googlesource.com/32207148', 'googleplex-android-review.googlesource.com/31299540', 'googleplex-android-review.googlesource.com/32333644', 'googleplex-android-review.googlesource.com/32470768', 'googleplex-android-review.googlesource.com/32628660', 'googleplex-android-review.googlesource.com/32773609', 'googleplex-android-review.googlesource.com/32221941', 'googleplex-android-review.googlesource.com/32482277', 'googleplex-android-review.googlesource.com/32648970'] into 24Q3-platform-release.
Change-Id: Iaf5d175cdeb7a20c85161ce71316e2c3e494992a
