Android 12.0.0 release 16
Snap for 7783696 from ae487ada1969c32e7bbd32d8a83fc587506cd51c to sc-qpr1-release

Change-Id: I74724555ad49941bc214dc3f2bac765e24c58069