Android platform 13.0.0 release 32
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30238752', 'googleplex-android-review.googlesource.com/31395461'] into tm-platform-release.

Change-Id: I43f834f18938215c1b47760d8d8103b7d4ebebc5