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

Change-Id: Id409b8a3ef781e9eb278f1f95b9ee5b393897b98