Android Platform 13.0.0 Release 14 (11048976)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24025006', 'googleplex-android-review.googlesource.com/24301336'] into tm-platform-release.

Change-Id: Ieb74765c0ad46ed42476fec5425993685b65bb09