Android platform 12.0.0 release 22
Merge cherrypicks of [20035119] into sc-platform-release.

Change-Id: I30398f1a5366cecbdb0ef4c621ebb8e23a2710d7