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

Change-Id: Icfd789036ab077a5cf4ee6a3869c3bf55da7d258