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

Change-Id: I696f39d4ad6ec47fcf5718083a06c6dba77ff273