Merge cherrypicks of ['android-review.googlesource.com/3561446', 'googleplex-android-review.googlesource.com/32890139'] into 25Q2-release.

Change-Id: I4a3e1269d983006c8397da2e8c03efec0805369d