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

Change-Id: I9d559d72a6b88d23ab3c1db3b66ccae5a4ee2d58