Android 13.0.0 Release 48 (TD4A.221205.042.B1)
Merge cherrypicks of ['ag/20889245'] into tm-d4-release.

Change-Id: I3b8f6101accdcde6b12ecadd7a6965055c62300c