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

Change-Id: I61f8a15285fe6db7dcc5f54419acc463c6e02475