Android 12.1.0 release 16
Snap for 8057497 from d6b71b5c36cd024a1ed5e79c37137973c28e0719 to sc-d2-release

Change-Id: I5edcb37dca768d5431cd49e39040f140d28258f1