Android 12.1.0 release 4
Snap for 8055317 from e00b7a33847832df81b9f5bfc4c5df0be2e4d863 to sc-v2-release

Change-Id: Ic46f024f67f01cf60245d188079e4ecf14a35db7