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

Change-Id: I7210f29fd739dd1aca27585e483cf1c1b6310e26