Android 13.0.0 release 0.94
Merge cherrypicks of ['partner-android-review.googlesource.com/2468882', 'partner-android-review.googlesource.com/2468883'] into android13-gs-pixel-5.10-release.

Change-Id: I9aecd35e0d10dcc4a5962a38321d3ffc3294920d