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

Change-Id: I76be971d75088d6afdcf0bc1bd2518e706670d1e