Android 12.0.0 release 6
Snap for 7579381 from c830e226e3b71ee51e29ba0345ce0bde1e90363a to sc-d1-release

Change-Id: Ibf2102f75c1fbdb3454fd09b2ee6f10bd36045d9