Android platform 12.0.0 release 25
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24151559'] into sc-platform-release.

Change-Id: I2635c52100096028bce6595ee203848464e95291