Android platform 13.0.0 release 2
Merge cherrypicks of [19291567, 19294092] into tm-release.

Change-Id: I29d07aeb4375be667f56b1b4f4ea5533871475e2