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

Change-Id: I6fd60d2160739146c2f8880e120c424971d31b22