Android 13.0.0 Release 47 (TD4A.221205.042.A1)
Merge cherrypicks of ['ag/20885781'] into tm-d4-release.

Change-Id: I7f681393415a6770f5d39bac13765ed464342f68