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

Change-Id: Ib3b191c4316144d836bdcb9cfbb7619bcedad20b