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

Change-Id: If53865f901ea7da4626137b001f05e80b915876f