Android 12.1.0 release 17
Snap for 8104874 from cc1b8cb0f52121916c7b29b1d5341fa830263c5f to sc-d2-release

Change-Id: I31023abc93df6c60ae4e59141d30cae40488b2ae