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

Change-Id: I7496a42e10064d9eeb4c4af88c43807a934a6c94