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

Change-Id: Ifdd9c0a2f608fe67ea56d1b6975265daf1c61452