Android security 12.1.0 release 1
Snap for 7362794 from 8fcaf4f51079b1adcf7dbde7cb46050cf4ef1a98 to sc-v2-release

Change-Id: Icd36e5ba43233f5c9da4ea43fc75879f76899733