Merge cherrypicks of ['android-review.googlesource.com/3285554',...

Merge cherrypicks of ['android-review.googlesource.com/3285554', 'android-review.googlesource.com/3285555', 'android-review.googlesource.com/3284617', 'android-review.googlesource.com/3284516', 'android-review.googlesource.com/3294791', 'android-review.googlesource.com/3295153', 'googleplex-android-review.googlesource.com/29827197'] into 24Q4-release.

Change-Id: I989412fbe1c341a41d577cce51d6f0c68583a114