Android Platform 12.0.0 Release 24 (SPM1.220819.041)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23185329'] into sc-platform-release.

Change-Id: Ie8b32381375bd6142a0e17be0323afde593ec511