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

Change-Id: I0f088b698f8c25d1993afb2fbb4f315d22471491