Android 13.0.0 Release 39 (TQ2A.230405.003.A2)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21559188'] into tm-qpr2-release.

Change-Id: I0c2fde09b8a58e57e1d083daaed643673e6890ba