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

Change-Id: I8e3c72aa46d632a955d5497235e0a64c3723e3ab