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

Change-Id: I222ad4a4c740cde9847a2939b664130fb39eed0a