Android security 12.1.0 release 1
Snap for 7160059 from b6e1d643c5dc8ada2215947a413a1425c8ca67dd to sc-v2-release

Change-Id: If593f5c2ba290343511a32cf012eb58fa3dfb050