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

Change-Id: Ieb52b57a5fe9de6699f5e5fff7fca347f124c2e8