Android Platform 13.0.0 Release 12 (TPM1.230623.007)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22316577'] into tm-platform-release.

Change-Id: I8e3c72aa46d632a955d5497235e0a64c3723e3ab