Merge cherrypicks of ['android-review.googlesource.com/3018422', 'android-review.googlesource.com/3038652', 'android-review.googlesource.com/3047772', 'android-review.googlesource.com/3047078', 'android-review.googlesource.com/3047702', 'android-review.googlesource.com/3047703', 'android-review.googlesource.com/3047956', 'googleplex-android-review.googlesource.com/26519773', 'googleplex-android-review.googlesource.com/26576426', 'googleplex-android-review.googlesource.com/26767676'] into 24Q2-release.
Change-Id: I3d7e5910f29f1545833681868254b08bc5455220