Android 12.0.0 release 7
Snap for 6597486 from 224ce8d6160a3149b39d1a8e55f98259c54fc00d to sc-d1-release

Change-Id: Ieef62dd3e567295eff226de3bff6d00d12830aba