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

Change-Id: Id9085fd7ced584e445a4b0d84e65e54cbf88415a