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

Change-Id: I0995fd83958e916caf7a6ba6dc27aaf2508b8be8