Android 13.0.0 release 9
Merge cherrypicks of [19458900] into tm-d1-release.

Change-Id: I2e891dc197a6545306a065048ed4682bd070f90d