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

Change-Id: I4269d6fba2580f72de0754337ed3bc1ea4ebce1f