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

Change-Id: I7685583fa1e047431276d169e1fdd1a97f878203