Android 15.0.0 release 25
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31416177'] into 25D4-release.

Change-Id: I5058248619f95115d960d864c37a00d3bea2bbe1