Android platform 12.0.0 release 19
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21320003'] into sc-platform-release.

Change-Id: Idd9f5faae6a10755c4c711448df7b482481c33f9