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

Change-Id: I94b28274ec848b53e6b3617a44c06b802caaf67f