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

Change-Id: Ic6fbb8d8ee576818e580ce22a073377eb3bd8111