Android 12.0.0 release 18
Snap for 7829835 from 5725db1a905d48c1589d109936390016c8819c62 to sc-qpr1-d-release

Change-Id: If0672aaf49570b1c5f38fdfd43b7d25353fd0fdc