Android platform 13.0.0 release 36
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30086988'] into tm-platform-release.

Change-Id: I06c73f95ac99d698d0b920db9a636071d4d82f75