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

Change-Id: If7194c91924b67f9dae38e1c44f98217813a4c4f