Android 12.1.0 release 24
Snap for 8104874 from 4afa33193c9020ece48fa5294a05eab1a4a67e44 to sc-d2-release

Change-Id: I57c9ebba3be2223946bd12ea5e7e08ea448e619e