Android platform 12.1.0 release 17
Merge cherrypicks of [19734284] into sc-v2-platform-release.

Change-Id: I62547abde56106bb002a1bdd1e5b163c037db910