Android 12.0.0 Release 2 (SP1A.210812.016)
Snap for 7357013 from b4b786ca611bc01daeab3a9e40db03885840ee20 to sc-release

Change-Id: Ie3a253beb86f8a9c9e8c50f94c45b8ad451397c9