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

Change-Id: I7a9ecf7f8356d1a63745e50630568bff61de99f1