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

Change-Id: If790306e285bf3d0c0e525c8f353e2f64ab79408