Android platform 12.1.0 release 21
Snap for 8589293 from ec8ec2a77d15f2cc748829d6af532e459c3a1e37 to sc-v2-platform-release

Change-Id: I9f168b31c302003598667ba15b02998e9c375611