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

Change-Id: Ic7f689a5bdd03ad4b058e1a3cb9d50fc787c1021