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

Change-Id: Ib7b24c55abd4d5107cf42fad4ce28a164d84c54f