Android 12.0.0 release 7
Snap for 7608384 from 62727d57138ff2fcc7c817564261ddc00b120731 to sc-d1-release

Change-Id: I646d68fb4c6f33892143b5afe02e2dad9e6801bc