Android Platform 12.1.0 Release 14 (SPM2.220819.022)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20660095'] into sc-v2-platform-release.

Change-Id: I85fa0e8c88fe94a3a2cb2301827ee3cb5f6dfa7d