Android 12.0.0 release 6
Snap for 7402811 from 854e221311214d58a72777b23565a1e0f843ff68 to sc-d1-release

Change-Id: I1a9458d7dcde833ab19b5b2cbee8a2289c9d4965