Merge cherrypicks of ['googleplex-android-review.googlesource.com/37796594', 'googleplex-android-review.googlesource.com/38717383', 'googleplex-android-review.googlesource.com/39157219', 'googleplex-android-review.googlesource.com/39425896', 'googleplex-android-review.googlesource.com/39369531', 'googleplex-android-review.googlesource.com/39535667', 'googleplex-android-review.googlesource.com/39369254', 'googleplex-android-review.googlesource.com/39409030', 'googleplex-android-review.googlesource.com/39585158', 'googleplex-android-review.googlesource.com/39737584', 'googleplex-android-review.googlesource.com/39448909', 'googleplex-android-review.googlesource.com/38995644', 'googleplex-android-review.googlesource.com/39800166', 'googleplex-android-review.googlesource.com/39793768', 'googleplex-android-review.googlesource.com/39748404', 'googleplex-android-review.googlesource.com/38820200', 'googleplex-android-review.googlesource.com/39436000', 'googleplex-android-review.googlesource.com/39804218', 'googleplex-android-review.googlesource.com/39814989', 'googleplex-android-review.googlesource.com/39676606', 'googleplex-android-review.googlesource.com/39807628', 'googleplex-android-review.googlesource.com/39804414', 'googleplex-android-review.googlesource.com/39980986', 'googleplex-android-review.googlesource.com/39807633', 'googleplex-android-review.googlesource.com/39977483', 'googleplex-android-review.googlesource.com/39915076', 'googleplex-android-review.googlesource.com/40188984', 'googleplex-android-review.googlesource.com/40204668', 'googleplex-android-review.googlesource.com/40124597', 'googleplex-android-review.googlesource.com/40496224', 'googleplex-android-review.googlesource.com/40293413', 'googleplex-android-review.googlesource.com/40099552', 'googleplex-android-review.googlesource.com/40302585', 'googleplex-android-review.googlesource.com/40234844', 'googleplex-android-review.googlesource.com/40480987', 'googleplex-android-review.googlesource.com/40111838', 'googleplex-android-review.googlesource.com/40493556', 'googleplex-android-review.googlesource.com/40456314', 'googleplex-android-review.googlesource.com/40631306', 'googleplex-android-review.googlesource.com/40496215', 'googleplex-android-review.googlesource.com/40823106', 'googleplex-android-review.googlesource.com/40281137'] into 24Q3-platform-release.

Change-Id: Ib73a3fa0c61fd470b1c623b5e0265c26da80bdba