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

Change-Id: I41679f63913b9b2bdeec9aea637c76e0ecaaeedc