Android platform 12.0.0 release 27
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24879207', 'googleplex-android-review.googlesource.com/25096450'] into sc-platform-release.

Change-Id: I20c3b7786603e4b5a2b479e3aa829e15dd7198d6