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

Change-Id: I5e802334f1069637b0c4f12baac09aa4dbf7699a