Android platform 12.1.0 release 23
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24879207', 'googleplex-android-review.googlesource.com/25096450'] into sc-v2-platform-release.

Change-Id: If036e6d1e2e45702659894ed96e20a1494d3790c