Merge cherrypicks of ['android-review.googlesource.com/3396835', 'googleplex-android-review.googlesource.com/30980213'] into 25Q1-release.Change-Id: I4848850232dfb8685cab631d638a0d7c1d2889d3