Android platform 13.0.0 release 15
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24878600', 'googleplex-android-review.googlesource.com/25096450'] into tm-platform-release.

Change-Id: Icd43c8e7a848a69bba232740b48b62a990b224f2