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

Change-Id: I541a98c3496b32a23c87749b2267858549e0eae5