Android platform 12.0.0 release 20
Merge cherrypicks of [16730965] into sc-platform-release.

Change-Id: I1c813181e9dfd49b137d64d1ab73f5bdf188652b