Android 12.1.0 release 3
Snap for 8060779 from d86cf5bffd10ee17828d21d68f7ac5d57e91a0d9 to sc-v2-release

Change-Id: Idb65349366ed181f44b25b5c6795bf2770178e7c