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

Change-Id: I552d298b54fbc12c74b8f2df9a58043a3bfcb083