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

Change-Id: I3cd78ba55c5dd743d27d3f37a8a88327586f7bc0