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

Change-Id: Ia8c24d25ba036949a1ba6c6e7ab0cacc3b015e72