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

Change-Id: Iacca440d946eb90e100669baa93b6a18297c65ef