Android platform 12.1.0 release 17
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22327782'] into sc-v2-platform-release.

Change-Id: I35f185387a2c3e611aadded2af92ea895481eef4