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

Change-Id: Ic8dd243b23f8a8ee6f076ff5283b491c5e7809cc