Android 13.0.0 release 66
Merge "Cherry-pick one upstream change" into tm-qpr-dev