Android 13.0.0 Release 31 (TP1A.221005.002.B2)
Merge cherrypicks of ['ag/19896771', 'ag/19957373'] into sparse-9012097-L13600000957677114.

Change-Id: I858a3426bb7cd0bb87f6e88db0ef4ac7d02e9398