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

Change-Id: Ifa2e1247a224bc17616f0aee5186b2455f7ce9dc