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

Change-Id: I01662e175a9b80de7c61219c54b071c4d40d2421