Android 12.0.0 release 6
Snap for 7160059 from a0074221150c75be9e45d2efafc9ab3709efac00 to sc-d1-release

Change-Id: I339c5bb1498052945570397a71ed1cedeaa815ef