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

Change-Id: I7534d034c05cc371341580cab393faacd51d8d1a