Android platform 12.1.0 release 21
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24296966', 'googleplex-android-review.googlesource.com/24296961', 'googleplex-android-review.googlesource.com/24433390'] into sc-v2-platform-release.

Change-Id: Idf554fa06187c0f6d4a8803b8334cf7cb0a0d853