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

Change-Id: I9e74fb7669cbadd7f165fdfaa955b3d548404300