Android platform 12.0.0 release 21
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22861203'] into sc-platform-release.

Change-Id: Iae65081aba5e15c238c8aae198152dc0d1459068