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

Change-Id: I809755f2e7dff82fd9f99aea1295020e9e9d2ed5