Android 13.0.0 release 24
Merge cherrypicks of [20349285] into tm-qpr1-release.

Change-Id: I55457c2f67c5545b611523d74fd104af74c17b49