Android 12.1.0 release 3
Snap for 7160059 from 6627ecc9dc07a23ade1914aa1e458e2502a4c654 to sc-v2-release

Change-Id: I709912c8f7b5b3bf09408c0ae68d74bbfcbf5b04