Android Platform 12.1.0 Release 34 (SPM2.220819.073)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28665234'] into sc-v2-platform-release.

Change-Id: I91543e12a9597c20d7b7f7558674ac22b26de9a3