Android 12.1.0 release 17
Snap for 7401515 from cc98bd7d51b467e1c3e196dad8bd81bd856f1ce5 to sc-d2-release

Change-Id: Idcb537dea874a073a73a82444fef137cd609e6ab