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

Change-Id: Ie8b32381375bd6142a0e17be0323afde593ec511