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

Change-Id: I503ef2ef180da343c1eff818a060821805f97d7f