Android 12.1.0 release 25
Snap for 8055317 from e00b7a33847832df81b9f5bfc4c5df0be2e4d863 to sc-d2-release

Change-Id: Ia734090351f38119d3a6c793caed12281613864e