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

Change-Id: I088d6694c48cee0afe9ba7654d80810f5fd633ff